projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 772eb43) | patch
iwlwifi: pcie: fix merge damage
authorJohannes Berg <johannes.berg@intel.com>
Mon, 30 Sep 2013 09:02:46 +0000 (11:02 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Oct 2013 14:34:55 +0000 (10:34 -0400)
commitd819c6cf1c064e74c50e38c3ff36a781bb49959c
tree1387aec7bae1d17c1cac3ccc31afdd5f872cef36tree | snapshot
parent772eb433357704ec3d6e0daa727d9ec3e85f50c1commit | diff
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>
drivers/net/wireless/iwlwifi/pcie/trans.c diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git