projects / linux-flexiantxendom0-natty.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
Port of xen3.3 xenlinux code to Ubuntu Natty kernel