diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-20 00:10:40 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-20 00:10:40 +0100 |
commit | 7d83f8fca517b123cf0136503a9e50974f65ec49 (patch) | |
tree | 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e /arch/x86/kernel/efi.c | |
parent | [ARM] pass reboot command line to arch_reset() (diff) | |
parent | [ARM] mv78xx0: Add Marvell RD-78x00-mASA Reference Design support (diff) | |
download | linux-7d83f8fca517b123cf0136503a9e50974f65ec49.tar.xz linux-7d83f8fca517b123cf0136503a9e50974f65ec49.zip |
Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:
arch/arm/mach-mx1/devices.c
Diffstat (limited to 'arch/x86/kernel/efi.c')
0 files changed, 0 insertions, 0 deletions