diff options
author | 2010-07-14 17:27:29 -0700 | |
---|---|---|
committer | 2010-07-14 17:27:29 -0700 | |
commit | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (patch) | |
tree | ed80eaf6245d8d1509662dc42e7184391b91e7d1 /kernel/sched_debug.c | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | powerpc/fsl-booke: Fix address issue when using relocatable kernels (diff) | |
download | linux-rng-ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548.tar.xz linux-rng-ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548.zip |
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/fsl-booke: Fix address issue when using relocatable kernels
powerpc/cpm1: Mark micropatch code/data static and __init
powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)
Diffstat (limited to 'kernel/sched_debug.c')
0 files changed, 0 insertions, 0 deletions