kernel-fxtec-pro1x/drivers/staging/ath6kl
Linus Torvalds 3f5785ec31 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: (89 commits)
  bonding: documentation and code cleanup for resend_igmp
  bonding: prevent deadlock on slave store with alb mode (v3)
  net: hold rtnl again in dump callbacks
  Add Fujitsu 1000base-SX PCI ID to tg3
  bnx2x: protect sequence increment with mutex
  sch_sfq: fix peek() implementation
  isdn: netjet - blacklist Digium TDM400P
  via-velocity: don't annotate MAC registers as packed
  xen: netfront: hold RTNL when updating features.
  sctp: fix memory leak of the ASCONF queue when free asoc
  net: make dev_disable_lro use physical device if passed a vlan dev (v2)
  net: move is_vlan_dev into public header file (v2)
  bug.h: Fix build with CONFIG_PRINTK disabled.
  wireless: fix fatal kernel-doc error + warning in mac80211.h
  wireless: fix cfg80211.h new kernel-doc warnings
  iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
  dst: catch uninitialized metrics
  be2net: hash key for rss-config cmd not set
  bridge: initialize fake_rtable metrics
  net: fix __dst_destroy_metrics_generic()
  ...

Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
2011-05-25 17:00:17 -07:00
..
bmi ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
hif ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
htc2 ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
include ath6kl: Remove ununsed macros from gpio_reg.h 2011-05-06 09:31:55 -07:00
miscdrv ath6kl: Remove ununsed macros from gpio_reg.h 2011-05-06 09:31:55 -07:00
os/linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2011-05-25 17:00:17 -07:00
reorder ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
wlan ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
wmi ath6kl: Remove gpio.h and gpio_api.h 2011-05-06 09:31:55 -07:00
Kconfig ath6kl: remove all the wext and super extended private ioctl crap 2011-04-04 22:58:06 -07:00
Makefile ath6kl: use CONFIG_ATH6KL_ENABLE_COEXISTENCE 2011-04-04 22:58:13 -07:00
TODO staging: ath6kl: update TODO file / maintainers 2011-02-23 13:59:56 -08:00