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)
commit4d02be5a6550ebf09936802c2cb8d359ce1ab29c
tree11845186f62a45a3809c477ea28daba8d94e0392
parent18bb4fb28760b3d23355f6e3cc3cbe1a07321c0a
parent2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50
Merge branch 'cleanup' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix build error after merge