summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/machine_kexec_32.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-05 17:57:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-05 17:58:03 +0200
commite765bf84d59257d3c4f948fbce426ea3565e83ad (patch)
treee6c2fa13b21a2faf398c3c6ceba8fe5187e381d7 /arch/x86/kernel/machine_kexec_32.c
parentFix OMAP EHCI suspend/resume failure (i693) '354ab856' causes (diff)
parentLinux 3.5-rc5 (diff)
downloadlinux-e765bf84d59257d3c4f948fbce426ea3565e83ad.tar.xz
linux-e765bf84d59257d3c4f948fbce426ea3565e83ad.zip
Merge 3.5-rc5 into usb-next
This resolves a merge issue with the option.c USB serial driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/machine_kexec_32.c')
0 files changed, 0 insertions, 0 deletions