Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2009-05-18 10:22:04 -07:00

parent ee3af6ee77 0e337b42d6

commit 3633832770

4 changed files with 76 additions and 55 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

105

arch/powerpc/configs/ps3_defconfig

View file

22

arch/powerpc/kernel/ftrace.c

View file

1

arch/powerpc/kernel/vmlinux.lds.S

View file

3

arch/powerpc/mm/pgtable.c

View file