Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Feb 2006 13:15:41 +0000 (08:15 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Feb 2006 13:15:41 +0000 (08:15 -0500)
commit750b50ab5687125d8a1dc946d931b00acf016e2c
treeeacec989ec38e67da84fcc6842b364670d7a1e34
parentab479995b191b4256183956c13caabb86331af8e
parent70c07e02625ec46d0ffbfce1acef42d660803528
Merge branch 'upstream' of git://git./linux/kernel/git/jgarzik/netdev-2.6
drivers/net/wireless/Kconfig