David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-10-08 07:14:06 +09:00
asm-generic	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00
clocksource
crypto	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
drm	drm/radeon: add some new SI PCI ids	2012-10-23 10:23:49 -04:00
keys	KEYS: Asymmetric key pluggable data parsers	2012-10-08 13:50:13 +10:30
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
math-emu
media	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
pcmcia
ras
rdma	infiniband: pass rdma_cm module to netlink_dump_start	2012-10-07 00:30:56 -04:00
rxrpc
scsi	SCSI misc on 20121012	2012-10-13 10:57:01 +09:00
sound	ALSA: Add a reference counter to card instance	2012-10-30 11:07:10 +01:00
target
trace	xen/mmu: Use Xen specific TLB flush instead of the generic one.	2012-10-31 12:38:31 -04:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	Bug-fixes:	2012-10-24 05:17:27 +03:00
Kbuild	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00