From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Jan 2012 23:03:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=869682384e78605897f9332700fe26c358ecf21c;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge git://git./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"
---

869682384e78605897f9332700fe26c358ecf21c