Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 7 Mar 2012 22:05:29 +0000 (14:05 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 7 Mar 2012 22:05:29 +0000 (14:05 -0800)
* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix build error after merge


Trivial merge