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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

2013-10-23 16:49:34 -04:00

..

bh.c

cw1200: When debug is enabled, display all wakeup conditions for the wait_event_interruptible_timeout() call.

2013-08-28 13:58:29 -04:00

bh.h

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

cw1200_sdio.c

cw1200: Fix an assorted pile of checkpatch warnings.

2013-06-11 12:48:10 -04:00

cw1200_spi.c

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

2013-10-23 16:49:34 -04:00

cw1200.h

cw1200: Fix up a large pile of sparse warnings

2013-06-24 14:44:24 -04:00

debug.c

cw1200: Eliminate the ETF debug/engineering code.

2013-06-11 12:48:10 -04:00

debug.h

cw1200: Remove "ITP" debug subsystem.

2013-06-11 12:48:09 -04:00

fwio.c

Revert "cw1200: Don't perform SPI transfers in interrupt context"

2013-09-26 14:02:31 -04:00

fwio.h

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

hwbus.h

Revert "cw1200: Don't perform SPI transfers in interrupt context"

2013-09-26 14:02:31 -04:00

hwio.c

Revert "cw1200: Don't perform SPI transfers in interrupt context"

2013-09-26 14:02:31 -04:00

hwio.h

cw1200: Fix up a large pile of sparse warnings

2013-06-24 14:44:24 -04:00

Kconfig

cw1200: Eliminate the ETF debug/engineering code.

2013-06-11 12:48:10 -04:00

main.c

cw1200: Display the correct default reference clock.

2013-08-28 13:58:28 -04:00

Makefile

cw1200: Remove "ITP" debug subsystem.

2013-06-11 12:48:09 -04:00

pm.c

cw1200: Rename 'sbus' to 'hwbus'

2013-06-03 15:54:37 -04:00

pm.h

cw1200: Fix compile with CONFIG_PM=n

2013-05-30 14:42:47 -04:00

queue.c

cw1200: Fix up a large pile of sparse warnings

2013-06-24 14:44:24 -04:00

queue.h

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

scan.c

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

scan.h

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

sta.c

cw1200: Fix spurious BUG_ON() trigger when starting AP mode.

2013-08-05 14:46:07 -04:00

sta.h

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

txrx.c

cw1200: Fix OOPS in monitor mode

2013-07-22 16:04:08 -04:00

txrx.h

cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets

2013-05-29 15:26:40 -04:00

wsm.c

treewide: Fix typo in printk

2013-08-20 12:44:03 +02:00

wsm.h

cw1200: Fix incorrect endianness annotation in a header field

2013-07-22 16:54:44 -04:00