summaryrefslogtreecommitdiff
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-06 02:38:41 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-06 02:38:41 +0400
commitd2b150d0647e055d7a71b1c33140280550b27dd6 (patch)
treeab27e9a19c9ab3a81886e1fceda2034e21e4c9e5 /arch/arm/mach-zynq
parentcbda94e039c3862326a65d1d0506447af8330c3c (diff)
parent13ce64c8f7750ce59066a987951faff38bb7dd97 (diff)
downloadlinux-d2b150d0647e055d7a71b1c33140280550b27dd6.tar.xz
Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC sh driver change from Arnd Bergmann: "The drivers/sh subdirectory used to get merged through the SH architecture tree, but things are in flux there and some of the drivers are shared with ARM shmobile, we have picked it up for the time being. There is only one trivial patch from Laurent Pinchart this time" * tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: sh: intc: Enable driver compilation with COMPILE_TEST
Diffstat (limited to 'arch/arm/mach-zynq')
0 files changed, 0 insertions, 0 deletions