Files
kernel/include/uapi/linux
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
..
2012-12-21 20:23:36 +00:00
2012-10-16 18:49:15 -07:00
2012-10-31 14:00:15 -04:00
2012-10-16 13:36:58 -04:00
2012-12-03 15:07:36 -05:00
2013-01-13 21:04:37 -05:00
2012-11-15 10:13:52 +01:00
2012-11-16 10:15:35 -08:00
2012-12-17 17:15:22 -08:00
2012-10-22 15:16:06 -04:00
2012-12-09 00:30:55 -05:00