]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit62a45ceea2a2e9ed7f0cd1fe4d47e03879392749
tree46650176484b2a8ad8fe5ccc23a075b42cbe2524
parentaf49dc02ea1b970a5d09e905213b82a3020daea9
parenta3b9d55350d6e54f4b4ed80eeda7a1b8f27c1db9
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c