Public Git Hosting - linux/fpc-iii.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 4fd6933 18c4646)

commit	994448f1afa6689bafbebaf7412b23b541b41ef5
author	Matt Fleming <matt.fleming@intel.com>
	Wed, 5 Mar 2014 18:15:37 +0000 (5 18:15 +0000)
committer	Matt Fleming <matt.fleming@intel.com>
	Wed, 5 Mar 2014 18:15:37 +0000 (5 18:15 +0000)
tree	b7460c6a9bdadc6554ad7f0da52b5c60403164c1	tree \| snapshot (tar.gz zip)
parent	4fd69331ad227a4d8de26592d017b73e00caca9f	commit \| diff
parent	18c46461d9e42d398536055f31f58cdcd2c6347e	commit \| diff

Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo

Conflicts:
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c
arch/x86/platform/efi/efi_64.c

arch/x86/include/asm/efi.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable_types.h	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi_64.c	diff1 \|	diff2 \|	blob \| history
include/linux/efi.h	diff1 \|	diff2 \|	blob \| history

Linux with added FPC-III support