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
..
asm-generic	sk-filter: Add ability to get socket filter program (v2)	2012-11-01 11:17:15 -04:00
drm	UAPI: (Scripted) Disintegrate include/drm	2012-10-04 18:21:50 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
mtd	UAPI: (Scripted) Disintegrate include/mtd	2012-10-09 09:49:09 +01:00
rdma	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
scsi	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
sound	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
video	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
xen	UAPI: (Scripted) Disintegrate include/xen	2012-10-09 09:49:15 +01:00
Kbuild	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00