Merge branch 'drivers/ocp2scp' into next/drivers
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 00:02:46 +0000 (17:02 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 00:02:46 +0000 (17:02 -0700)
* drivers/ocp2scp:
  drivers: bus: omap-ocp2scp: Fix compile error


Trivial merge