]> err.no Git - linux-2.6/commitdiff
Merge branch 'from-linus'
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 01:12:23 +0000 (20:12 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 01:12:23 +0000 (20:12 -0500)
1  2 
Documentation/feature-removal-schedule.txt
drivers/net/Kconfig
drivers/net/wireless/ipw2200.c

Simple merge
Simple merge