commit | eb9eef616b0ce14d554f75da197c0bfee8d2132f | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Fri May 11 22:21:51 2012 -0700 |
committer | Olof Johansson <olof@lixom.net> | Fri May 11 22:21:51 2012 -0700 |
tree | 17c93adeb2d2f9317ae14a1f350282e06f504f30 | |
parent | 86822f816fc9a42fd210e35d4881e988406497c0 [diff] | |
parent | 19b08b33fa4c60d66d4e341d4d1d9a6e86ffc9e6 [diff] |
Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup * '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