Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
authorJeff Garzik <jeff@garzik.org>
Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
committerJeff Garzik <jeff@garzik.org>
Sun, 23 Dec 2007 04:25:16 +0000 (23:25 -0500)
commit61c93f4eb45493f203d6bad24156599668be614f
tree55a096677bbb6a6d1840bb44769193c0e9eefa84
parent9914cad54c79d0b89b1f066c0894f00e1344131c
parent412e9e7800360ec93b6ba319b30666f6bfc721bd
Merge branch 'fixes-jgarzik' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes
drivers/net/wireless/Kconfig
drivers/net/wireless/ipw2200.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c