James Morris 12a5a2621b Merge branch 'master' into next ... Conflicts: include/linux/capability.h Manually resolve merge conflict w/ thanks to Stephen Rothwell. Signed-off-by: James Morris <jmorris@namei.org>		2011-05-19 18:51:57 +10:00
..
acpi	Fix common misspellings	2011-03-31 11:26:23 -03:00
asm-generic	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
crypto
drm	drm: Take lock around probes for drm_fb_helper_hotplug_event	2011-05-16 12:01:43 +10:00
keys	libceph: Create a new key type "ceph".	2011-03-29 12:11:24 -07:00
linux	Merge branch 'master' into next	2011-05-19 18:51:57 +10:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-04-27 15:17:52 -07:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-13 15:20:51 -07:00
pcmcia
rdma
rxrpc	Fix common misspellings	2011-03-31 11:26:23 -03:00
scsi	scsi: remove performance regression due to async queue run	2011-05-17 11:04:44 +02:00
sound	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
staging	[media] Altera FPGA firmware download module	2011-03-21 20:32:16 -03:00
target	Fix common misspellings	2011-03-31 11:26:23 -03:00
trace	mm: tracing: add missing GFP flags to tracing	2011-05-11 18:50:45 -07:00
video	Fix common misspellings	2011-03-31 11:26:23 -03:00
xen	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kbuild