Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
authorPaul Mackerras <paulus@samba.org>
Wed, 4 Oct 2006 05:20:34 +0000 (15:20 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 4 Oct 2006 05:20:34 +0000 (15:20 +1000)
1  2 
arch/powerpc/Kconfig

Simple merge