From: David Vrabel Date: Mon, 7 Apr 2014 12:52:12 +0000 (+0100) Subject: Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15 X-Git-Tag: v3.15-rc1~56^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5cb2770392fb9c5d8518688c8bc61986d70dc6;p=pandora-kernel.git Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15 This merge of the irq-core-for-linus branch broke the ARM build when Xen is enabled. Conflicts: drivers/xen/events/events_base.c --- 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 Reading git-diff-tree failed