diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:12:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:12:33 -0500 |
| commit | bcede2f64a3b5cb50c0bdec1553ab480fd75d659 (patch) | |
| tree | b98e55bf2eea83bb5f6805abb210c5ea8625b550 /arch/x86/boot/video.c | |
| parent | d0b9706c20ebb4ba181dc26e52ac9a6861abf425 (diff) | |
| parent | 2d2da60fb40a80cc59383121ccf763e0e0e8a42a (diff) | |
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, efi: Break up large initrd reads
x86, efi: EFI boot stub support
efi: Add EFI file I/O data types
efi.h: Add boottime->locate_handle search types
efi.h: Add graphics protocol guids
efi.h: Add allocation types for boottime->allocate_pages()
efi.h: Add efi_image_loaded_t
efi.h: Add struct definition for boot time services
x86: Don't use magic strings for EFI loader signature
x86: Add missing bzImage fields to struct setup_header
Diffstat (limited to 'arch/x86/boot/video.c')
0 files changed, 0 insertions, 0 deletions