summaryrefslogtreecommitdiffstats
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-02-28 20:00:55 +0100
committerLinus Torvalds2010-02-28 20:00:55 +0100
commit30ff056c42c665b9ea535d8515890857ae382540 (patch)
treef9875bcf01aec2f264ed7b198fc29aa4e1eafd50 /kernel/printk.c
parentMerge branch 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentx86, uv: Remove recursion in uv_heartbeat_enable() (diff)
downloadkernel-qcow2-linux-30ff056c42c665b9ea535d8515890857ae382540.tar.gz
kernel-qcow2-linux-30ff056c42c665b9ea535d8515890857ae382540.tar.xz
kernel-qcow2-linux-30ff056c42c665b9ea535d8515890857ae382540.zip
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, uv: Remove recursion in uv_heartbeat_enable() x86, uv: uv_global_gru_mmr_address() macro fix x86, uv: Add serial number parameter to uv_bios_get_sn_info()
Diffstat (limited to 'kernel/printk.c')
0 files changed, 0 insertions, 0 deletions