]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorArnd Bergmann <arnd@arndb.de>
Wed, 29 Feb 2012 20:56:18 +0000 (20:56 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 29 Feb 2012 20:56:18 +0000 (20:56 +0000)
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: split omap2/3/4_check_revision function
  ARM: OMAP2+: Make cpu_rev static global variable

1  2 
arch/arm/mach-omap2/io.c

Simple merge