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)
commitb23f46c7471d0adcf81092b6702299562c4149c5
treee12e2481046102133e5b84f38526e510e69d209d
parentabf45ce84c4e36bd64aef20d7df9a79bd5e4b799
parent5405520d08b691bfa5bdad395ad72ecbc0979d3b
Merge branch 'soc' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc

* '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
arch/arm/mach-omap2/io.c