David S. Miller 6dec4ac4ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/inet_diag.c		2011-11-26 14:47:03 -05:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
asm-generic	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2011-11-17 13:11:43 -05:00
crypto
drm	drm/radeon: add some missing FireMV pci ids	2011-11-15 19:43:06 +00:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-26 14:47:03 -05:00
math-emu
media	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-26 14:47:03 -05:00
pcmcia
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-11-01 10:51:38 -07:00
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
sound	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2011-11-06 19:00:42 -08:00
trace	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
video
xen	xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI	2011-11-16 12:13:42 -05:00
Kbuild