Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD

* HEAD:
  [NET]: fix __sk_stream_mem_reclaim
  [Bluetooth] Fix deadlock in the L2CAP layer
  [Bluetooth] Let BT_HIDP depend on INPUT
  [Bluetooth] Avoid NULL pointer dereference with tty->driver
  [Bluetooth] Remaining transitions to use kzalloc()
  [WAN]: converting generic HDLC to use netif_dormant*()
  [IPV4]: Fix error handling for fib_insert_node call
  [NETROM] lockdep: fix false positive
  [ROSE] lockdep: fix false positive
  [AX.25]: Optimize AX.25 socket list lock
  [IPCOMP]: Fix truesize after decompression
  [IPV6]: Use ipv6_addr_src_scope for link address sorting.
  [TCP] tcp_highspeed: Fix AI updates.
  [MAINTAINERS]: Add proper entry for TC classifier
  [NETROM]: Drop lock before calling nr_destroy_socket
  [NETROM]: Fix locking order when establishing a NETROM circuit.
  [AX.25]: Fix locking of ax25 protocol function list.
  [IPV6]: order addresses by scope

diff --combined MAINTAINERS
index 5276d52,ec8846f..a3462c3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -274,7 -274,7 +274,7 @@@ S: Maintaine
  ALI1563 I2C DRIVER
  P:    Rudolf Marek
  M:    r.marek@sh.cvut.cz
 -L:    lm-sensors@lm-sensors.org
 +L:    i2c@lm-sensors.org
  S:    Maintained
  
  ALPHA PORT
@@@ -1249,7 -1249,7 +1249,7 @@@ S:      Maintaine
  I2C SUBSYSTEM
  P:    Jean Delvare
  M:    khali@linux-fr.org
 -L:    lm-sensors@lm-sensors.org
 +L:    i2c@lm-sensors.org
  W:    http://www.lm-sensors.nu/
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
  S:    Maintained
@@@ -2093,7 -2093,7 +2093,7 @@@ S:      Maintaine
  OPENCORES I2C BUS DRIVER
  P:    Peter Korsgaard
  M:    jacmet@sunsite.dk
 -L:    lm-sensors@lm-sensors.org
 +L:    i2c@lm-sensors.org
  S:    Maintained
  
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
@@@ -2752,6 -2752,12 +2752,12 @@@ P:    Christoph Hellwi
  M:    hch@infradead.org
  S:    Maintained
  
+ TC CLASSIFIER
+ P:    Jamal Hadi Salim
+ M:    hadi@cyberus.ca
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
  TI OMAP RANDOM NUMBER GENERATOR SUPPORT
  P:    Deepak Saxena
  M:    dsaxena@plexity.net
@@@ -3132,7 -3138,7 +3138,7 @@@ S:      Maintaine
  VIAPRO SMBUS DRIVER
  P:    Jean Delvare
  M:    khali@linux-fr.org
 -L:    lm-sensors@lm-sensors.org
 +L:    i2c@lm-sensors.org
  S:    Maintained
  
  UCLINUX (AND M68KNOMMU)
@@@ -3180,11 -3186,6 +3186,11 @@@ S:    Maintaine
  W1 DALLAS'S 1-WIRE BUS
  P:    Evgeniy Polyakov
  M:    johnpol@2ka.mipt.ru
 +S:    Maintained
 +
 +W83791D HARDWARE MONITORING DRIVER
 +P:    Charles Spirakis
 +M:    bezaur@gmail.com
  L:    lm-sensors@lm-sensors.org
  S:    Maintained