James Morris d2e7ad1922 Merge branch 'master' into next ... Conflicts: security/smack/smack_lsm.c Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au> Ok'd by Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <jmorris@namei.org>		2011-01-10 09:46:24 +11:00
..
accessibility
acpi	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
amba
ata	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-04 11:57:25 -08:00
auxdisplay
base
block	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
bluetooth
cdrom	gdrom: don't use flush_scheduled_work()	2010-12-24 15:59:06 +01:00
char	Merge branch 'master' into next	2011-01-10 09:46:24 +11:00
clk
clocksource
connector
cpufreq	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
cpuidle	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
crypto
dca
dio
dma	dma: shdma: don't register the global die notifier multiple times	2011-01-07 11:03:26 +09:00
edac	Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-01-07 14:54:03 -08:00
eisa
firewire
firmware
gpio	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
gpu	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-01-07 14:45:47 -08:00
hwmon	hwmon: (s3c-hwmon) Fix compilation	2011-01-02 15:31:11 -08:00
i2c
ide
idle	perf: Clean up power events by introducing new, more generic ones	2011-01-04 08:16:54 +01:00
ieee802154
infiniband	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
input	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
isdn	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
leds	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
lguest
macintosh	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
mca
md
media	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
memstick
message
mfd	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
misc	ioc4: use static work_struct for ioc4_load_modules()	2010-12-24 16:14:20 +01:00
mmc	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
mtd	Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin	2011-01-07 08:56:33 -08:00
net	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
nubus
of	of/i2c: Fix request module by alias	2010-12-24 01:28:54 -07:00
oprofile
parisc
parport
pci	PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c	2010-12-23 12:51:49 -08:00
pcmcia	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
platform	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-06 11:06:31 -08:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
s390	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-01-07 12:47:02 -08:00
serial	Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-01-07 14:50:14 -08:00
sfi
sh	sh: intc: Initialize radix tree gfp mask explicitly.	2010-12-24 19:38:37 +09:00
sn
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2011-01-07 17:08:46 -08:00
ssb	ssb: Use pci_is_pcie()	2010-12-22 15:43:26 -05:00
staging	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-01-07 17:02:58 -08:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-01-07 14:39:20 -08:00
uio
usb	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
uwb
vhost
video	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
virtio
vlynq
w1
watchdog	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
xen
zorro
Kconfig
Makefile	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00