]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 12 May 2012 05:21:51 +0000 (22:21 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 12 May 2012 05:21:51 +0000 (22:21 -0700)
* 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: OTG integration: fix compiler warning
  ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds


Trivial merge