Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  smc91c92_cs.c: fix bogus compiler warning
  orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002
  hostap_cs: support cards with "Version 01.02" as third product ID
  pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3
  pxa2xx pcmcia - stargate 2 use gpio array.
  pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.
  drivers:pcmcia:soc_common: make socket_init and socket_suspend optional
f33c596a
Name Last commit Last update
..
Kconfig wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig
Makefile [PATCH] hostap: don't #include C files in hostap_main.c
hostap.h hostap: convert usage of net/ieee80211.h to linux/ieee80211.h
hostap_80211.h drivers/net: use __packed annotation
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
hostap_80211_tx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
hostap_ap.c Fix common misspellings
hostap_ap.h Fix common misspellings
hostap_common.h drivers/net: use __packed annotation
hostap_config.h net: change to new flag variable
hostap_cs.c hostap_cs: support cards with "Version 01.02" as third product ID
hostap_download.c drivers/net: remove useless semicolons
hostap_hw.c hostap: don't use flush_scheduled_work()
hostap_info.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
hostap_ioctl.c Fix common misspellings
hostap_main.c net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared
hostap_pci.c hostap_pci: set dev->base_addr during probe
hostap_plx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
hostap_proc.c lib80211: absorb crypto bits from net/ieee80211
hostap_wlan.h net: remove interrupt.h inclusion from netdevice.h