git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcad8e4 5ac6c72)
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 25 Nov 2014 05:53:57 +0000 (07:53 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 25 Nov 2014 05:53:57 +0000 (07:53 +0200)
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/iwl-fw.h


Trivial merge
Pandora Kernel Repository