Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Thu, 24 Apr 2008 10:57:20 +0000 (20:57 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 24 Apr 2008 10:57:20 +0000 (20:57 +1000)
1  2 
arch/ppc/syslib/m8xx_setup.c

Simple merge