diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 21:32:09 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-04 21:32:09 +0100 |
commit | d4d3b19212a1045ff8224e680375076b3677ede7 (patch) | |
tree | a6ef0044ca7afbc3ddb631a2e158cc8a3b7ba7ba /lib/locking-selftest-wsem.h | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff) | |
parent | binfmt_elf_fdpic: Fix build breakage introduced by coredump changes. (diff) | |
download | linux-d4d3b19212a1045ff8224e680375076b3677ede7.tar.xz linux-d4d3b19212a1045ff8224e680375076b3677ede7.zip |
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.
Diffstat (limited to 'lib/locking-selftest-wsem.h')
0 files changed, 0 insertions, 0 deletions