summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds2010-04-20 18:20:55 +0200
committerLinus Torvalds2010-04-20 18:20:55 +0200
commitac8bf564307962a763a52b34e771205c58b76ec8 (patch)
tree851fe4ebd22cca979744dace54a8d628143bbc4b /drivers/char
parentMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentsparc64: Fix hardirq tracing in trap return path. (diff)
downloadkernel-qcow2-linux-ac8bf564307962a763a52b34e771205c58b76ec8.tar.gz
kernel-qcow2-linux-ac8bf564307962a763a52b34e771205c58b76ec8.tar.xz
kernel-qcow2-linux-ac8bf564307962a763a52b34e771205c58b76ec8.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix hardirq tracing in trap return path. sparc64: Use correct pt_regs in decode_access_size() error paths. sparc64: Fix PREEMPT_ACTIVE value. sparc64: Run NMIs on the hardirq stack. sparc64: Allocate sufficient stack space in ftrace stubs. sparc: Fix forgotten kmemleak headers inclusion
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions