tree 97a19986b95a23fb9da450e7d6b19fcc94ed6da9
parent 344a7829c421ce6c626cb94c6576f66a7c28a871
parent cff502a38394fd33693f6233e03fca363dfa956d
author Linus Torvalds <torvalds@linux-foundation.org> 1221342417 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221342417 -0700

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