refs/heads/lejun/mixed-mode - pub/scm/linux/kernel/git/mfleming/efi

commit: 60c564cd964236adf5a085e1885573072d3843fd

[log]
author: Matt Fleming <matt.fleming@intel.com>

Thu Mar 20 09:14:13 2014 +0000
committer: Matt Fleming <matt.fleming@intel.com>

Thu Mar 20 09:14:13 2014 +0000
tree: 8dcbd63c5084335e5b65527e613718532c53bca9
parent: dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 [diff]
parent: 58e4f1ad425895294eecad902da96c2dc65000d3 [diff]

Merge branch 'mixed-mode' into lejun/mixed-mode

Conflicts:
	arch/x86/kernel/setup.c

tree: 8dcbd63c5084335e5b65527e613718532c53bca9