| commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 | [log] [tgz] |
|---|---|---|
| author | Matt Fleming <matt.fleming@intel.com> | Fri Oct 03 22:15:56 2014 +0100 |
| committer | Matt Fleming <matt.fleming@intel.com> | Fri Oct 03 22:15:56 2014 +0100 |
| tree | e607db32fd303246ee9b93af83a611fc7b93479a | |
| parent | fe82dcec644244676d55a1384c958d5f67979adb [diff] | |
| parent | 7efe665903d0d963b0ebf4cab25cc3ae32c62600 [diff] |
Merge branch 'next' into efi-next-merge Conflicts: arch/x86/boot/compressed/eboot.c