Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Wed, 10 Sep 2008 01:36:13 +0000 (11:36 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 10 Sep 2008 01:36:13 +0000 (11:36 +1000)
commit7e392f8c29ee045c6a29d50193d2fb10712eceb0
treec84097fe644c50c82f087ab7fa2d75167b8c0e16
parent7713fef06517d216f96ee7c8ad750e72bc08d38f
parent93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95
Merge branch 'linux-2.6'
arch/powerpc/kernel/Makefile
arch/powerpc/mm/hash_utils_64.c