From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 13 Aug 2012 18:57:31 +0000 (+0100)
Subject: ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE
X-Git-Tag: v3.6-rc3~32^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89868730a756feca7e4b21a97c86487cd565ed22;p=pandora-kernel.git

ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE

Seems that Thomas' and my patches collided during the last merge
window.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed