| commit | 363383277081ce831642b72df40932ee05ce40a2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 18 10:22:04 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 18 10:22:04 2009 -0700 |
| tree | df7785ed6807cb6d5bcb8ef6431fd1cbf172051f | |
| parent | ee3af6ee77f61cac3c8f770c65736bf5ed03a697 [diff] | |
| parent | 0e337b42d620ca7c45fe64e64dd71957c56216c9 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Explicit alignment for .data.cacheline_aligned powerpc/ps3: Update ps3_defconfig powerpc/ftrace: Fix constraint to be early clobber powerpc/ftrace: Use pr_devel() in ftrace.c powerpc: Do not assert pte_locked for hugepage PTE entries