summaryrefslogtreecommitdiffstats
path: root/block/ioctl.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-09-30 11:02:46 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-10-07 19:34:43 +0200
commitd107babca27f3c08e399616483e4c5f010bd24d3 (patch)
tree359f12f44cf8cda7c5fb28f5561130403baf88f1 /block/ioctl.c
parentath9k: fix tx queue scheduling after channel changes (diff)
downloadlinux-d107babca27f3c08e399616483e4c5f010bd24d3.tar.xz
linux-d107babca27f3c08e399616483e4c5f010bd24d3.zip
iwlwifi: pcie: fix merge damage
The merge b35c8097 seems to have lost commit eabc4ac5d, put the code back. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions