summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-14 17:10:27 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-14 17:10:27 +0200
commita985aabe4d7a720b109c2b63549f8641676a9c88 (patch)
tree47484925d172a10eb65bcf5594d1bcd85b9c7032 /arch/sh/kernel
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentrevert "sched: fix fair sleepers" (diff)
downloadlinux-a985aabe4d7a720b109c2b63549f8641676a9c88.tar.xz
linux-a985aabe4d7a720b109c2b63549f8641676a9c88.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: revert "sched: fix fair sleepers"
Diffstat (limited to 'arch/sh/kernel')
0 files changed, 0 insertions, 0 deletions