summaryrefslogtreecommitdiff
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2012-08-13 18:57:31 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-08-15 09:46:51 (GMT)
commit89868730a756feca7e4b21a97c86487cd565ed22 (patch)
tree40850f3a4efd453f763f438268fd649ae4d40bcc /mm/memblock.c
parent080fc66fb5b6feae19fbbe8c6cbd7b11a4dac636 (diff)
downloadlinux-fsl-qoriq-89868730a756feca7e4b21a97c86487cd565ed22.tar.xz
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>
Diffstat (limited to 'mm/memblock.c')
0 files changed, 0 insertions, 0 deletions