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
..
acpi
asm-generic	mm: limit mmu_gather batching to fix soft lockups on !CONFIG_PREEMPT	2013-01-04 16:11:46 -08:00
clocksource
crypto
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel	2013-01-11 07:52:48 +10:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
pcmcia
ras
rdma	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00
rxrpc
scsi
sound	Merge remote-tracking branch 'asoc/fix/cs4271' into tmp	2013-01-10 12:22:11 +00:00
target
trace	Various bug fixes for ext4. Perhaps the most serious bug fixed is one	2013-01-02 09:57:34 -08:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
video
xen	Bugfixes:	2012-12-18 12:26:54 -08:00
Kbuild	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00