tree a6ef0044ca7afbc3ddb631a2e158cc8a3b7ba7ba
parent e43c259777999d19532cf418ca69ce1288b42edc
parent 2f48912d1443a796f10c42c89cb386f0e3eca04d
author Linus Torvalds <torvalds@linux-foundation.org> 1262637129 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262637129 -0800

Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.
  sh: update defconfigs.
  sh: Don't default enable PMB support.
  sh: Disable PMB for SH4AL-DSP CPUs.
  sh: Only provide a PCLK definition for legacy CPG CPUs.