summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-07-07 13:59:06 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-01 21:25:20 -0400
commit77a87824ed676ca8ff8482e4157d3adb284fd381 (patch)
treeeca062e0d63648cfce1be4b6ae0257f3248bb28f /MAINTAINERS
parente48af7aaf1e6d266414b11540339e6d2dac20ad2 (diff)
downloadlinux-sh-77a87824ed676ca8ff8482e4157d3adb284fd381.tar.gz
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:
Switch to MULTIPLATFORM" Missed conflict between commit c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the clockevents tree. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions