Len Brown
d0e323b470
Merge branch 'apei' into apei-release
...
Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
2011-08-03 11:30:42 -04:00
..
acpi
Merge branch 'apei' into apei-release
2011-08-03 11:30:42 -04:00
asm-generic
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-26 17:12:10 -07:00
crypto
drm
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
keys
linux
Merge branch 'apei' into apei-release
2011-08-03 11:30:42 -04:00
math-emu
media
[media] V4L: initial driver for ov5642 CMOS sensor
2011-07-27 17:56:09 -03:00
mtd
net
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2011-07-31 06:23:08 -10:00
rdma
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
rxrpc
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2011-07-30 08:36:02 -10:00
sound
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2011-07-30 00:08:53 -07:00
target
trace
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2011-08-01 13:56:03 -10:00
video
xen
Kbuild