Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
commit2ed0e21b30b53d3a94e204196e523e6c8f732b56
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2009 16:40:05 +0000 (15 09:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2009 16:40:05 +0000 (15 09:40 -0700)
treede2635426477d86338a9469ce09ba0626052288f
parent0fa213310cd8fa7a51071cdcf130e26fa56e9549
parent9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb
Merge git://git./linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...
arch/powerpc/include/asm/qe.h
drivers/net/ucc_geth.c
drivers/net/ucc_geth.h
drivers/of/base.c
include/linux/pci_ids.h