Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

control.c

wimax/i2400m: introduce i2400m_reset(), stopping TX and carrier

2009-11-03 12:49:36 -08:00

debug-levels.h

wimax/i2400m: allow control of the base-station idle mode timeout

2009-03-02 03:10:25 -08:00

debugfs.c

wimax/i2400m: introduce i2400m_reset(), stopping TX and carrier

2009-11-03 12:49:36 -08:00

driver.c

drivers/net/wimax/i2400m/driver.c: use %pM to show MAC address

2010-01-07 01:14:01 -08:00

fw.c

Merge branch 'for-next' into for-linus

2010-03-08 16:55:37 +01:00

i2400m-sdio.h

wimax/i2400m: don't retry SDIO enable in probe() paths

2009-11-03 12:49:39 -08:00

i2400m-usb.h

wimax/i2400m: Add support for more i6x50 SKUs

2010-01-21 16:49:24 -08:00

i2400m.h

tree-wide: Assorted spelling fixes

2010-02-09 11:13:56 +01:00

Kconfig

i2400m-sdio: select IWMC3200TOP in Kconfig

2009-10-19 23:22:51 -07:00

Makefile

wimax/i2400m: allow control of the base-station idle mode timeout

2009-03-02 03:10:25 -08:00

netdev.c

wimax/i2400m: fix device getting stuck in IDLE mode

2009-11-03 12:49:36 -08:00

op-rfkill.c

wimax: fix gcc warnings in sh4 when calling BUG()

2009-06-11 11:47:39 -07:00

rx.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-12-09 19:43:33 -08:00

sdio-debug-levels.h

…

sdio-fw.c

wimax/i2400m: be smarter about copying command buffer to bm_cmd_buf

2009-10-19 15:55:46 +09:00

sdio-rx.c

wimax/i2400m: reduce verbosity of debug messages in boot mode

2009-10-19 15:56:11 +09:00

sdio-tx.c

wimax/i2400m: fix oops in TX when tearing down the device

2009-10-19 15:56:20 +09:00

sdio.c

tree-wide: Assorted spelling fixes

2010-02-09 11:13:56 +01:00

sysfs.c

wimax/i2400m: allow control of the base-station idle mode timeout

2009-03-02 03:10:25 -08:00

tx.c

wimax/i2400m: fix oops in TX when tearing down the device

2009-10-19 15:56:20 +09:00

usb-debug-levels.h

…

usb-fw.c

wimax/i2400m: fix bad assignment of return value in i2400mu_tx_bulk_out

2009-11-03 12:49:41 -08:00

usb-notif.c

wimax/i2400m: add reason argument to i2400m_dev_reset_handle()

2009-10-19 15:56:01 +09:00

usb-rx.c

wimax/i2400m: handle USB stalls

2009-11-03 12:49:40 -08:00

usb-tx.c

wimax/i2400m: handle USB stalls

2009-11-03 12:49:40 -08:00

usb.c

tree-wide: Assorted spelling fixes

2010-02-09 11:13:56 +01:00