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)
commit1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a
tree0cf88547108a750d6eb910564ef5bf0ffb5ceef3
parent91cac623262c1c0cd298c5c648a8bd2b647c264d
parent23e0e8afafd9ac065d81506524adf3339584044b
Merge branch 'merge' into next
arch/powerpc/boot/dts/mpc8349emitx.dts
arch/powerpc/mm/hugetlbpage.c