Merge branch 'cleanup' of git://git.kernel.org/pub/scm/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
This commit is contained in:
Olof Johansson 2012-03-07 14:05:29 -08:00
commit 4d02be5a65
4 changed files with 5 additions and 0 deletions