tree 8b0654cec2ccfbf70f163caa66c98f6316b91f0d
parent d6042eac44b54dc5c7cb839175eb51dfd03d7633
parent d8f46ff11081f03b09efe82245a3257bab6bf60e
author Linus Torvalds <torvalds@linux-foundation.org> 1325718229 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325718229 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  fix CAN MAINTAINERS SCM tree type
  mwifiex: fix crash during simultaneous scan and connect
  b43: fix regression in PIO case
  ath9k: Fix kernel panic in AR2427 in AP mode
  CAN MAINTAINERS update
  net: fsl: fec: fix build for mx23-only kernel
  sch_qfq: fix overflow in qfq_update_start()
  Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"