David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
drm	drm/exynos: consider both case of vflip and hflip.	2013-01-04 15:54:33 +09:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
mtd	UAPI: (Scripted) Disintegrate include/mtd	2012-10-09 09:49:09 +01:00
rdma	UAPI: (Scripted) Disintegrate include/rdma	2012-11-22 00:43:10 -08:00
scsi
sound	ALSA: Extend chmap definitions for UAC2	2012-11-26 16:18:59 +01:00
video
xen	UAPI: (Scripted) Disintegrate include/xen	2012-10-09 09:49:15 +01:00
Kbuild