projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6dbe51c 2470b36)
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)
commit41effc2a6c6548f1dc6b749f09c646d931c309a4
treed99a5da02df4e4ab06a251dcd3960c153cbfd037tree | snapshot
parent6dbe51c251a327e012439c4772097a13df43c5b8commit | diff
parent2470b36e84a2e680d7a7e3809cbceae5bfae3606commit | 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>
Domain: System / Kernel;