Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Wed, 3 Dec 2008 09:11:06 +0000 (20:11 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 3 Dec 2008 09:11:06 +0000 (20:11 +1100)
commit527491885554002837b5742202adc0ab5f536e54
tree6d9c44776e0b4368eccd414b92b957fac3c5a4c6
parentcea555d384b85271035814c5adad23e6c7fc5d2a
parent2434bbb30e79468c49cff3cff6005236f55ed188
Merge branch 'merge'
arch/powerpc/kernel/prom_parse.c
arch/powerpc/mm/hugetlbpage.c
arch/powerpc/sysdev/mpic.c