From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 00:02:46 +0000 (-0700)
Subject: Merge branch 'drivers/ocp2scp' into next/drivers
X-Git-Tag: v3.7-rc1~156^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7405a749ae14f846cc2892c36d1a9343b0264b7c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'drivers/ocp2scp' into next/drivers

* drivers/ocp2scp:
  drivers: bus: omap-ocp2scp: Fix compile error
---

7405a749ae14f846cc2892c36d1a9343b0264b7c