Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Tue, 25 Mar 2008 21:44:18 +0000 (08:44 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 25 Mar 2008 21:44:18 +0000 (08:44 +1100)
commit54f53f2b94feb72622bec7a8563fc487d9f97720
treeab0c4e1dcadd25a00fa7a4febf41bc43b864cf73
parentf61fb8a52cdf8b9b6a6badde84aefe58cb35d315
parenta4083c9271e0a697278e089f2c0b9a95363ada0a
Merge branch 'linux-2.6'
arch/powerpc/kernel/process.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/platforms/cell/iommu.c