]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Apr 2014 22:38:41 +0000 (15:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Apr 2014 22:38:41 +0000 (15:38 -0700)
commit01ef8713f239ce569c957ed9c354b7175952161d
treeab27e9a19c9ab3a81886e1fceda2034e21e4c9e5
parent1ca6c4f90e48f3f285070046913a522200532737
parentf999acbf2abdeb6ff83c64387df7069217fd6d0e
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