projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Domain: System / Kernel;