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)
commitb370b08274a25cf1e2015fb7ce65c43173c8156f
tree0c8f990148da4ca1275ac5471c93c519754f4aec
parent75e89b02e338d0db27f8e5d66642c7e2ae49c326
parent7e25867fe8d705bcf707ef52004b669eb795d06d
Merge branch 'for-2.6.25' of /linux/kernel/git/galak/powerpc into for-2.6.25
drivers/net/Kconfig