Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Sep 2008 21:46:57 +0000 (14:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Sep 2008 21:46:57 +0000 (14:46 -0700)
commitb151399fdc54e0a6e9b882c8db8c2c558cf5a9d3
tree97a19986b95a23fb9da450e7d6b19fcc94ed6da9
parent1b1f42a5b71e79926ef5d9456b0b1bb3d613617e
parent543508c9dd39ccac75b912450620fffedab0939e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  niu: panic on reset
  netlink: fix overrun in attribute iteration
  [Bluetooth] Fix regression from using default link policy
  ath9k: Assign seq# when mac80211 requests this