linux/drivers/net/wimax/i2400m
David S. Miller bb7e95c8fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-27 21:01:35 -07:00
..
control.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
debug-levels.h
debugfs.c
driver.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax 2010-05-15 23:14:16 -07:00
fw.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-06-11 13:32:31 -07:00
i2400m-sdio.h wimax/i2400m: fix the race condition for accessing TX queue 2010-05-11 14:04:46 -07:00
i2400m-usb.h wimax/i2400m: Add PID & VID for Intel WiMAX 6250 2010-07-22 14:50:34 -07:00
i2400m.h wimax/i2400m: Move module params to other file so they can be static 2010-05-11 14:10:24 -07:00
Kconfig
Makefile
netdev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax 2010-05-15 23:14:16 -07:00
op-rfkill.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
rx.c Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax 2010-05-25 14:05:24 -07:00
sdio-debug-levels.h
sdio-fw.c
sdio-rx.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
sdio-tx.c wimax/i2400m: add the error recovery mechanism on TX path 2010-05-11 14:05:39 -07:00
sdio.c wimax/i2400m: SDIO specific TX queue's minimum buffer room for new message 2010-05-11 14:08:58 -07:00
sysfs.c
tx.c wimax/i2400m: reserve additional space in the TX queue's buffer while allocating space for a new message header 2010-05-11 14:08:50 -07:00
usb-debug-levels.h
usb-fw.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
usb-notif.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
usb-rx.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
usb-tx.c
usb.c Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax 2010-07-24 20:51:45 -07:00