summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-09-30 09:02:46 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2013-10-02 14:34:55 (GMT)
commitd819c6cf1c064e74c50e38c3ff36a781bb49959c (patch)
tree1387aec7bae1d17c1cac3ccc31afdd5f872cef36 /firmware
parent772eb433357704ec3d6e0daa727d9ec3e85f50c1 (diff)
downloadlinux-fsl-qoriq-d819c6cf1c064e74c50e38c3ff36a781bb49959c.tar.xz
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 'firmware')
0 files changed, 0 insertions, 0 deletions