]> 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: 26e7421 d7a4858)
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 01:36:59 +0000 (12:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 01:36:59 +0000 (12:36 +1100)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c


Trivial merge
Linux kernel for KaRo TX COM modules