David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36f
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

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

2010-07-20 18:25:24 -07:00

..

hostap_80211_rx.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-17 13:57:43 -04:00

hostap_80211_tx.c

…

hostap_80211.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

hostap_ap.c

wireless:hostap_ap.c Fix warning: variable 'fc' set but not used

2010-06-18 15:05:12 -04:00

hostap_ap.h

…

hostap_common.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

hostap_config.h

…

hostap_cs.c

hostap: Protect against initialization interrupt

2010-06-15 15:44:41 -04:00

hostap_download.c

drivers/net: remove useless semicolons

2010-05-17 22:47:34 -07:00

hostap_hw.c

hostap: Protect against initialization interrupt

2010-06-15 15:44:41 -04:00

hostap_info.c

…

hostap_ioctl.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-17 13:57:43 -04:00

hostap_main.c

hostap: fixup strlen() math

2010-07-12 16:05:32 -04:00

hostap_pci.c

hostap_pci: set dev->base_addr during probe

2010-07-14 13:49:46 -04:00

hostap_plx.c

…

hostap_proc.c

…

hostap_wlan.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-06-17 14:19:06 -07:00

hostap.h

…

Kconfig

…

Makefile

…