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

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c

2008-11-18 23:38:23 -08:00

..

hostap_80211_rx.c

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-03 21:11:17 -08:00

hostap_80211_tx.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_80211.h

hostap_80211.h: remove duplicate prototype

2008-01-31 19:26:50 -08:00

hostap_ap.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_ap.h

[PATCH] hostap: don't #include C files in hostap_main.c

2006-01-16 16:51:54 -05:00

hostap_common.h

wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts

2008-10-31 19:00:50 -04:00

hostap_config.h

[PATCH] hostap: Remove driver version number

2007-07-08 22:16:38 -04:00

hostap_cs.c

pcmcia: remove unused argument to pcmcia_parse_tuple()

2008-08-31 15:50:33 +02:00

hostap_download.c

hostap annotations

2008-01-28 15:09:05 -08:00

hostap_hw.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_info.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_ioctl.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_main.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_pci.c

pci: use pci_ioremap_bar() in drivers/net

2008-10-31 00:53:48 -04:00

hostap_plx.c

hostap: section mismatch warning

2008-01-16 12:53:32 -05:00

hostap_proc.c

net: convert print_mac to %pM

2008-10-27 17:06:18 -07:00

hostap_wlan.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-11-18 23:38:23 -08:00

hostap.h

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -07:00

Kconfig

[WIRELESS]: Refactor wireless Kconfig.

2007-04-25 22:29:40 -07:00

Makefile

[PATCH] hostap: don't #include C files in hostap_main.c

2006-01-16 16:51:54 -05:00