summaryrefslogtreecommitdiffstats
path: root/net/wireless/chan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-11-05 21:58:21 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-11-05 21:58:21 +0100
commit6b732323c1e1ced5c76350bfef2cc8c233f9dcb9 (patch)
tree9107bbe331f51bf1c5db11d4744583b042bf2585 /net/wireless/chan.c
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff)
parentBluetooth: revert: "Bluetooth: Add missing reset_resume dev_pm_ops" (diff)
downloadlinux-6b732323c1e1ced5c76350bfef2cc8c233f9dcb9.tar.xz
linux-6b732323c1e1ced5c76350bfef2cc8c233f9dcb9.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/wireless/chan.c')
0 files changed, 0 insertions, 0 deletions