Merge branch 'merge' into next
authorPaul Mackerras <paulus@samba.org>
Tue, 16 Dec 2008 03:38:58 +0000 (14:38 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 16 Dec 2008 03:38:58 +0000 (14:38 +1100)
1  2 
arch/powerpc/boot/dts/mpc8349emitx.dts
arch/powerpc/mm/hugetlbpage.c

Simple merge