]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fcfe76 65af8de)
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Dec 2010 21:37:55 +0000 (16:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Dec 2010 21:40:49 +0000 (16:40 -0500)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
drivers/net/wireless/iwlwifi/iwl-core.h


Trivial merge
Linux kernel for KaRo TX COM modules