Skip to content
  • Linus Torvalds's avatar
    Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD · e47f3178
    Linus Torvalds authored
    * 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
    e47f3178