git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe82dce 7efe665)
Merge branch 'next' into efi-next-merge
authorMatt Fleming <matt.fleming@intel.com>
Fri, 3 Oct 2014 21:15:56 +0000 (22:15 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Fri, 3 Oct 2014 21:15:56 +0000 (22:15 +0100)
Conflicts:
arch/x86/boot/compressed/eboot.c


Trivial merge
Pandora Kernel Repository