Ingo Molnar 37bf06375c Merge tag 'v3.12-rc4' into sched/core ...

Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-10-09 12:36:13 +02:00

..

acpi

Merge branch 'acpi-hotplug'

2013-08-30 14:14:25 +02:00

asm-generic

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02: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

crypto: scatterwalk - Add support for calculating number of SG elements

2013-08-21 21:27:58 +10:00

drm

Revert "drm: mark context support as a legacy subsystem"

2013-09-20 08:32:59 +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

ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256

2013-08-30 16:12:39 +03:00

linux

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02: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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

2013-10-01 12:39:35 -04:00

pcmcia

pcmcia/ds.h: introduce helper for pcmcia_driver module boilerplate

2013-03-15 12:26:03 -07:00

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 tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

uapi

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

2013-09-29 10:02:40 -07: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

UAPI: remove empty Kbuild files

2013-04-30 17:04:09 -07:00