summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorH. Peter Anvin2012-05-30 21:11:26 +0200
committerH. Peter Anvin2012-05-30 21:11:32 +0200
commitbbd771474ec44b516107685d77e1c80bbe09f141 (patch)
tree0cb15781539a68f27b4ea6c89f827282630cbce6 /CREDITS
parentMerge branch 'x86/mce' into x86/urgent (diff)
parentx86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.c (diff)
downloadkernel-qcow2-linux-bbd771474ec44b516107685d77e1c80bbe09f141.tar.gz
kernel-qcow2-linux-bbd771474ec44b516107685d77e1c80bbe09f141.tar.xz
kernel-qcow2-linux-bbd771474ec44b516107685d77e1c80bbe09f141.zip
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a newer baseline. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions