James Morris b7b57551bb Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus ... Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c Manually resolve conflicts. Signed-off-by: James Morris <jmorris@namei.org>		2011-05-24 23:20:19 +10:00
..
acpi	Fix common misspellings	2011-03-31 11:26:23 -03:00
asm-generic	sanitize <linux/prefetch.h> usage	2011-05-20 12:50:29 -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' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
math-emu
media	[media] rc: add locking to fix register/show race	2011-05-20 16:21:22 -03:00
mtd
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
pcmcia
rdma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
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 'topic/asoc' into for-linus	2011-05-22 10:01:33 +02:00
staging
target	Fix common misspellings	2011-03-31 11:26:23 -03:00
trace	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 18:14:34 -07:00
video	Merge branch 'master' into for-next	2011-04-26 10:22:59 +02:00
xen	xen/irq: Export 'xen_pirq_from_irq' function.	2011-04-14 11:17:55 -04:00
Kbuild