| commit | f885b51967fb5f611c462841e5119853df00cc97 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jan 15 08:01:48 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jan 15 08:01:48 2008 -0800 |
| tree | 29ba7f6eb9dd607980e63917e7f68e88578e7aca | |
| parent | 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 [diff] | |
| parent | dfbe0d3b6be52596b5694b1bb75b19562e769021 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix boot failure on POWER6 [POWERPC] Workaround for iommu page alignment