linux/drivers/bluetooth
Linus Torvalds 5f05647dd8 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: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
2010-10-23 11:47:02 -07:00
..
Kconfig Bluetooth: Support for Atheros AR300x serial chip 2010-07-21 10:39:14 -07:00
Makefile Bluetooth: Support for Atheros AR300x serial chip 2010-07-21 10:39:14 -07:00
ath3k.c Bluetooth: Add missing kfree() on error path in Atheros driver 2010-02-27 14:05:38 +01:00
bcm203x.c Bluetooth: Use kmemdup for drivers 2010-07-21 10:39:06 -07:00
bfusb.c Bluetooth: Convert controller hdev->type to hdev->bus 2010-02-27 14:05:38 +01:00
bluecard_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
bpa10x.c Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
bt3c_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
btmrvl_debugfs.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
btmrvl_drv.h Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
btmrvl_main.c Bluetooth: HCI devices are either BR/EDR or AMP radios 2010-10-12 12:44:51 -03:00
btmrvl_sdio.c Bluetooth: Use kzalloc for drivers 2010-07-21 10:39:06 -07:00
btmrvl_sdio.h Bluetooth: Fix incorrect alignment in Marvell BT-over-SDIO driver 2009-08-22 14:25:34 -07:00
btsdio.c Bluetooth: Support SDIO devices that are AMP controllers 2010-10-12 12:44:51 -03:00
btuart_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
btusb.c Bluetooth: Add support Bluetooth controller of MacbookPro 7,1 2010-10-12 12:44:52 -03:00
dtl1_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
hci_ath.c Bluetooth: Fix kfree() => kfree_skb() in hci_ath.c 2010-07-27 15:27:45 -07:00
hci_bcsp.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_h4.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_ldisc.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
hci_ll.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_uart.h Bluetooth: Support for Atheros AR300x serial chip 2010-07-21 10:39:14 -07:00
hci_vhci.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00