]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1550423 5becc11)
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Wed, 6 Mar 2013 15:46:25 +0000 (16:46 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 6 Mar 2013 15:46:43 +0000 (16:46 +0100)
commitb359cfbd7f9ddadbe9e115312873b00f66558f57
treed99a5da02df4e4ab06a251dcd3960c153cbfd037tree | snapshot
parent1550423bbae002d3be1ebdba2fe7b0d0e8ade01ecommit | diff
parent5becc112a6bc54c8b7643b3d795c0258b886368ecommit | diff
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

This is needed to resolve some conflicts that would otherwise
happen between wireless-next and the code here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Linux Kernel Source Tree.