David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-04-01 13:36:50 -04:00

..

c_can

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-02-05 14:12:20 -05:00

cc770

can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block

2013-01-26 16:58:58 +01:00

mscan

can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block

2013-01-26 16:58:58 +01:00

sja1000

can: sja1000: limit PEAK PCAN-PC Card to HAS_IOPORT

2013-03-27 14:51:49 +01:00

softing

can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block

2013-01-26 16:58:58 +01:00

usb

drivers: net: Remove remaining alloc/OOM messages

2013-02-08 17:44:39 -05:00

at91_can.c

can: at91_can: add dt support

2013-03-27 13:07:08 +01:00

bfin_can.c

can: bfin_can: declare locally used functions static

2013-03-27 13:07:10 +01:00

dev.c

can: rework skb reserved data handling

2013-01-28 18:17:25 -05:00

flexcan.c

can: flexcan: add LED trigger support

2013-01-26 16:58:59 +01:00

grcan.c

can: remove __dev* attributes

2012-12-03 11:16:11 -08:00

janz-ican3.c

can: remove __dev* attributes

2012-12-03 11:16:11 -08:00

Kconfig

can: Kconfig: CAN_AT91 depends on ARM

2013-03-27 13:07:08 +01:00

led.c

can: rename LED trigger name on netdev renames

2013-01-26 16:58:59 +01:00

Makefile

can: add tx/rx LED trigger support

2013-01-26 16:58:59 +01:00

mcp251x.c

can: mcp251x: Use dev_pm_ops

2013-03-27 13:07:09 +01:00

pch_can.c

can: pch_can: fix invalid error codes

2013-01-26 17:13:41 +01:00

slcan.c

can: rework skb reserved data handling

2013-01-28 18:17:25 -05:00

ti_hecc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-01-29 15:32:13 -05:00

vcan.c

sections: fix section conflicts in drivers/net

2012-10-06 03:04:42 +09:00