Linus Torvalds c44eaf41a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits) net: Add support for SMSC LAN9530, LAN9730 and LAN89530 mlx4_en: Restoring RX buffer pointer in case of failure mlx4: Sensing link type at device initialization ipv4: Fix "Set rt->rt_iif more sanely on output routes." MAINTAINERS: add entry for Xen network backend be2net: Fix suspend/resume operation be2net: Rename some struct members for clarity pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev dsa/mv88e6131: add support for mv88e6085 switch ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2) be2net: Fix a potential crash during shutdown. bna: Fix for handling firmware heartbeat failure can: mcp251x: Allow pass IRQ flags through platform data. smsc911x: fix mac_lock acquision before calling smsc911x_mac_read iwlwifi: accept EEPROM version 0x423 for iwl6000 rt2x00: fix cancelling uninitialized work rtlwifi: Fix some warnings/bugs p54usb: IDs for two new devices wl12xx: fix potential buffer overflow in testmode nvs push zd1211rw: reset rx idle timer from tasklet ...		2011-04-11 07:27:24 -07:00
..
acx.c	wl12xx: Correctly set up protection if non-GF STAs are present	2011-03-03 16:20:34 +02:00
acx.h	wl12xx: AP-mode - fix race condition on sta connection	2011-02-23 11:14:55 +02:00
boot.c	wl12xx: Do end-of-transactions transfers only if needed	2011-03-03 16:10:46 +02:00
boot.h	wl12xx: Do end-of-transactions transfers only if needed	2011-03-03 16:10:46 +02:00
cmd.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
cmd.h	wl12xx: move to new firmware (6.1.3.50.49)	2011-02-08 22:51:42 -02:00
conf.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
debugfs.c	wl12xx: Switch to a threaded interrupt handler	2011-03-03 16:10:46 +02:00
debugfs.h	wl1271: Change wl12xx Files Names	2010-11-22 16:45:09 +02:00
event.c	wl12xx: move to new firmware (6.1.3.50.49)	2011-02-08 22:51:42 -02:00
event.h	wl12xx: move to new firmware (6.1.3.50.49)	2011-02-08 22:51:42 -02:00
ini.h	wl1271: Change wl12xx Files Names	2010-11-22 16:45:09 +02:00
init.c	wl12xx: change type from u8 to int	2011-02-22 18:06:35 +02:00
init.h	wl12xx: AP mode - init sequence	2011-01-24 22:11:48 +02:00
io.c	wl1271: Add wl1271_load_firmware() and export some functions	2010-12-02 16:17:20 +02:00
io.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	wl12xx: fix sdio_test kconfig/build errors	2011-02-21 15:39:56 -05:00
main.c	wl12xx: Modify requested number of memory blocks	2011-03-03 16:12:57 +02:00
Makefile	wl12xx_sdio_test: rename files to match current style	2010-12-15 17:09:27 +02:00
ps.c	wl12xx: Switch to a threaded interrupt handler	2011-03-03 16:10:46 +02:00
ps.h	wl12xx: Switch to a threaded interrupt handler	2011-03-03 16:10:46 +02:00
reg.h	wl1271: Change wl12xx Files Names	2010-11-22 16:45:09 +02:00
rx.c	wl12xx: Switch to a threaded interrupt handler	2011-03-03 16:10:46 +02:00
rx.h	wl12xx: use standard ALIGN() macro	2011-02-23 11:11:19 +02:00
scan.c	wl12xx: wakeup chip from ELP during scan	2011-03-03 16:20:25 +02:00
scan.h	wl1271: Change wl12xx Files Names	2010-11-22 16:45:09 +02:00
sdio_test.c	wl12xx_sdio_test: rename files to match current style	2010-12-15 17:09:27 +02:00
sdio.c	wl12xx: fix module author's email address in the spi and sdio modules	2011-04-04 15:22:11 -04:00
spi.c	wl12xx: fix module author's email address in the spi and sdio modules	2011-04-04 15:22:11 -04:00
testmode.c	wl12xx: fix potential buffer overflow in testmode nvs push	2011-04-04 15:22:12 -04:00
testmode.h	wl1271: Change wl12xx Files Names	2010-11-22 16:45:09 +02:00
tx.c	wl12xx: Switch to a threaded interrupt handler	2011-03-03 16:10:46 +02:00
tx.h	wl12xx: AP-mode - TX queue per link in AC	2011-02-23 11:14:56 +02:00
wl12xx_80211.h	ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition	2011-03-09 16:10:56 -05:00
wl12xx_platform_data.c	wl12xx: add platform data passing support	2010-09-21 11:04:57 -04:00
wl12xx.h	wl12xx: Avoid redundant TX work	2011-03-03 16:12:57 +02:00