linux/drivers/bluetooth
Linus Torvalds 7a6362800c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
ath3k.c Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2011-02-18 17:03:41 -05:00
bcm203x.c
bfusb.c
bluecard_cs.c
bpa10x.c
bt3c_cs.c
btmrvl_debugfs.c
btmrvl_drv.h
btmrvl_main.c
btmrvl_sdio.c
btmrvl_sdio.h
btsdio.c
btuart_cs.c
btusb.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-03-03 21:27:42 -08:00
btwilink.c Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00
dtl1_cs.c
hci_ath.c hci_ath: Fix the mess in this driver 2011-02-17 12:03:53 -08:00
hci_bcsp.c
hci_h4.c
hci_ldisc.c Bluetooth: Make hci a child of the corresponding tty device. 2011-02-16 16:33:25 -03:00
hci_ll.c
hci_uart.h
hci_vhci.c
Kconfig Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00
Makefile Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00