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.

1 files changed, 8 insertions, 12 deletions

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index ed371684c133..6ae5ec508587 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -27,31 +27,27 @@ menuconfig BT
           compile it as module (bluetooth).
 
           To use Linux Bluetooth subsystem, you will need several user-space
-          utilities like hciconfig and hcid.  These utilities and updates to
-          Bluetooth kernel modules are provided in the BlueZ packages.
-          For more information, see <http://www.bluez.org/>.
+          utilities like hciconfig and bluetoothd.  These utilities and updates
+          to Bluetooth kernel modules are provided in the BlueZ packages.  For
+          more information, see <http://www.bluez.org/>.
+
+if BT != n
 
 config BT_L2CAP
-        tristate "L2CAP protocol support"
-        depends on BT
+        bool "L2CAP protocol support"
         select CRC16
         help
           L2CAP (Logical Link Control and Adaptation Protocol) provides
           connection oriented and connection-less data transport.  L2CAP
           support is required for most Bluetooth applications.
 
-          Say Y here to compile L2CAP support into the kernel or say M to
-          compile it as module (l2cap).
-
 config BT_SCO
-        tristate "SCO links support"
-        depends on BT
+        bool "SCO links support"
         help
           SCO link provides voice transport over Bluetooth.  SCO support is
           required for voice applications like Headset and Audio.
 
-          Say Y here to compile SCO support into the kernel or say M to
-          compile it as module (sco).
+endif
 
 source "net/bluetooth/rfcomm/Kconfig"