summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-04 15:03:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-04 15:03:49 -0800
commit869682384e78605897f9332700fe26c358ecf21c (patch)
tree8b0654cec2ccfbf70f163caa66c98f6316b91f0d /include
parentd6042eac44b54dc5c7cb839175eb51dfd03d7633 (diff)
parentd8f46ff11081f03b09efe82245a3257bab6bf60e (diff)
downloadlinux-3.10-869682384e78605897f9332700fe26c358ecf21c.tar.gz
linux-3.10-869682384e78605897f9332700fe26c358ecf21c.tar.bz2
linux-3.10-869682384e78605897f9332700fe26c358ecf21c.zip
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"
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions