summaryrefslogtreecommitdiffstats
path: root/block/ioctl.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-10-10 19:19:58 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-10-10 19:19:58 +0200
commitc380a1fda55c7853c5e767998365247f4030ef3b (patch)
treedc65f2557d4271ff56b1e6fd84bba4f9cf4a1ad3 /block/ioctl.c
parentiwlwifi: pcie: fix merge damage (diff)
parentmac80211: Run deferred scan if last roc_list item is not started (diff)
downloadlinux-c380a1fda55c7853c5e767998365247f4030ef3b.tar.xz
linux-c380a1fda55c7853c5e767998365247f4030ef3b.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions