David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ... Conflicts: MAINTAINERS drivers/net/Kconfig drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c drivers/net/ethernet/broadcom/tg3.c drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/wl12xx/main.c		2011-09-22 03:23:13 -04:00
..
c_can	can: c_can: remove duplicated #include	2011-07-23 20:01:15 -07:00
mscan	net/can/mscan: add __iomem annotations	2011-08-15 12:52:20 +02:00
sja1000	can/sja1000: driver for PEAK PCAN PCI/PCIe cards	2011-09-21 02:29:02 -04:00
softing	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
usb	Fix common misspellings	2011-03-31 11:26:23 -03:00
at91_can.c	can: at91_can: add support for the AT91SAM9X5 SOCs	2011-06-06 14:50:57 +02:00
bfin_can.c	can: bfin_can: auto-calculate accessor sizes	2011-06-27 20:42:24 -07:00
dev.c	can: make function can_get_bittiming static	2011-07-21 20:39:47 -07:00
flexcan.c	flexcan: Prefer device tree clock frequency if available.	2011-08-17 20:36:38 -07:00
janz-ican3.c	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-05 23:23:37 -07:00
Makefile	can: c_can: Added support for Bosch C_CAN controller	2011-02-13 22:51:44 -08:00
mcp251x.c	can: mcp251x: Allow pass IRQ flags through platform data.	2011-04-06 12:24:26 -07:00
pch_can.c	treewide: fix a few typos in comments	2011-05-10 10:16:21 +02:00
slcan.c	slcan: ldisc generated skbs are received in softirq context	2011-08-11 05:52:57 -07:00
ti_hecc.c	can: ti_hecc: include linux/io.h	2011-09-16 19:21:27 -04:00
vcan.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00