]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af49dc0 a3b9d55)
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:44:44 +0000 (11:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:44:44 +0000 (11:44 +1000)
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c


Trivial merge
Linux kernel for KaRo TX COM modules