| commit | d4d3b19212a1045ff8224e680375076b3677ede7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 04 12:32:09 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 04 12:32:09 2010 -0800 |
| tree | a6ef0044ca7afbc3ddb631a2e158cc8a3b7ba7ba | |
| parent | e43c259777999d19532cf418ca69ce1288b42edc [diff] | |
| parent | 2f48912d1443a796f10c42c89cb386f0e3eca04d [diff] |
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.