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

..

bcma_driver_chipcommon.h

bgmac: driver for GBit MAC core on BCMA bus

2013-01-09 23:37:03 -08:00

bcma_driver_gmac_cmn.h

Drivers: bcma: remove __dev* attributes.

2013-01-03 15:57:15 -08:00

bcma_driver_mips.h

bcma: just do the necessary things in early register on SoCs

2012-10-19 15:52:18 -04:00

bcma_driver_pci.h

Drivers: bcma: remove __dev* attributes.

2013-01-03 15:57:15 -08:00

bcma_regs.h

bcma: add and use constants for the flash windows

2012-10-19 15:52:36 -04:00

bcma_soc.h

bcma: add SOC bus

2011-08-08 14:29:25 -04:00

bcma.h

Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

2012-12-19 12:47:41 -08:00