John Stultz 19c3205cea Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time ...

Merge in 64bit sched_clock support that missed 3.12.

Conflicts:
	kernel/time/sched_clock.c

Signed-off-by: John.Stultz <john.stultz@linaro.org>

2013-09-16 18:52:52 -07:00

..

acpi

…

asm-generic

Merge branch 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2013-09-09 10:26:33 -07:00

clocksource

Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-09-06 13:21:16 -07:00

crypto

…

drm

Merge tag 'drm-intel-fixes-2013-09-06' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

2013-09-10 12:36:55 +10:00

dt-bindings

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

2013-09-10 13:53:52 -07:00

keys

…

kvm

…

linux

Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time

2013-09-16 18:52:52 -07:00

math-emu

…

media

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-09-05 14:54:29 -07:00

memory

…

misc

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-09-11 14:33:16 -07:00

pcmcia

…

ras

…

rdma

Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next

2013-09-03 09:01:08 -07:00

rxrpc

…

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-09-12 16:11:45 -07:00

sound

Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2013-09-12 08:52:41 -07:00

target

target/iscsi: Bump versions to v4.1.0

2013-09-10 20:23:37 -07:00

trace

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-09-12 15:01:38 -07:00

uapi

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2013-09-15 07:13:39 -04:00

video

Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2013-09-05 09:49:32 -07:00

xen

Merge tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2013-09-04 17:45:39 -07:00

Kbuild

…