From: Matt Fleming <matt.fleming@intel.com>
Date: Fri, 3 Oct 2014 21:15:56 +0000 (+0100)
Subject: Merge branch 'next' into efi-next-merge
X-Git-Tag: fixes-against-v3.18-rc2~16^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75b128573b275d5a5a7210b98c4b8cb3b39c12e7;p=pandora-kernel.git

Merge branch 'next' into efi-next-merge

Conflicts:
	arch/x86/boot/compressed/eboot.c
---

75b128573b275d5a5a7210b98c4b8cb3b39c12e7
Reading git-diff-tree failed