Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
authorPaul Mackerras <paulus@samba.org>
Wed, 6 Feb 2008 11:08:37 +0000 (22:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 6 Feb 2008 11:08:37 +0000 (22:08 +1100)
1  2 
drivers/net/Kconfig

Simple merge