git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 071d499 a877836)
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Mon, 27 May 2013 11:30:49 +0000 (13:30 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 27 May 2013 11:30:49 +0000 (13:30 +0200)
Conflicts:
drivers/net/wireless/iwlwifi/mvm/ops.c


Trivial merge
Pandora Kernel Repository