projects / linux-flexiantxendom0-natty.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 503b1a5 3d986b2)
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)
commit63e35cd9bd4c8ae085c8b9a70554595b529c4100
tree68e771e0035d5f3ee394a3d86885631a2610bba5tree | snapshot
parent503b1a529a6b62b31904bab4699752c523cf76b2commit | diff
parent3d986b25b5faa50ba6afd94f60f270b6c3061e5ecommit | diff
Merge branch 'master' of git://git./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
Port of xen3.3 xenlinux code to Ubuntu Natty kernel