]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d5acf7 a59f7cc)
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)
commit405d8e0f89df8ea74bed5c52a26124aef8d9d743
treed99a5da02df4e4ab06a251dcd3960c153cbfd037tree | snapshot
parent5d5acf7f3e8c669857f1288b923731e4b4ceb550commit | diff
parenta59f7cc62425c9f003ecb556bc10ba0410bb6594commit | 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.