tmp_suning_uos_patched/net/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
..
bnep Bluetooth: remove l2cap_load() hack 2011-02-15 09:45:52 -03:00
cmtp Bluetooth: remove l2cap_load() hack 2011-02-15 09:45:52 -03:00
hidp Bluetooth: remove l2cap_load() hack 2011-02-15 09:45:52 -03:00
rfcomm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
af_bluetooth.c Bluetooth: remove unnecessary call to hci_sock_cleanup 2011-02-25 22:36:58 -03:00
hci_conn.c Bluetooth: Use ERR_PTR as return error from hci_connect 2011-02-27 17:11:29 -03:00
hci_core.c Bluetooth: Fix some code style issues in hci_core.c 2011-02-17 13:31:32 -03:00
hci_event.c Bluetooth: Add mgmt_auth_failed event 2011-02-21 17:22:44 -03:00
hci_sock.c Bluetooth: fix build break on hci_sock.c 2011-02-22 08:43:52 -03:00
hci_sysfs.c Bluetooth: Fix errors reported by checkpatch.pl 2011-02-17 19:22:19 -03:00
Kconfig Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig 2011-02-28 14:06:53 -05:00
l2cap_core.c Bluetooth: Use ERR_PTR as return error from hci_connect 2011-02-27 17:11:29 -03:00
l2cap_sock.c Bluetooth: fix errors reported by checkpatch.pl 2011-02-17 19:16:55 -03:00
lib.c Bluetooth: make batostr() print in the right order 2010-10-12 12:44:52 -03:00
Makefile Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko 2011-02-14 17:27:36 -03:00
mgmt.c Bluetooth: Fix some small code style issues in mgmt.c 2011-03-01 22:19:48 -03:00
sco.c Bluetooth: Use ERR_PTR as return error from hci_connect 2011-02-27 17:11:29 -03:00