]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02c95d7 847bc3d)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Dec 2010 19:27:21 +0000 (14:27 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Dec 2010 19:27:21 +0000 (14:27 -0500)
commit1fb2e561541e9c15639d62002ead9772a57efa34
tree68e771e0035d5f3ee394a3d86885631a2610bba5tree | snapshot
parent02c95d73c651cd3aaad2ba3c3d4fcc7f11b815dacommit | diff
parent847bc3da400de6e3673cb0a6285b1171d2920da9commit | diff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.