Merge branch 'drivers/ocp2scp' into next/drivers
authorOlof Johansson <olof@lixom.net>
Thu, 20 Sep 2012 23:12:47 +0000 (16:12 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 20 Sep 2012 23:13:03 +0000 (16:13 -0700)
commit1ef3f756b069469621a47ded867e71c97e1b483f
tree3e4eeec39cd098b025d24fc47d711eb0bcd265d9
parent25696b4b3541d5f7641b61e6abfda765426834b8
parent2c2d16745a3a0924e2335722f5a1676a0c501b1f
Merge branch 'drivers/ocp2scp' into next/drivers

Pick up one more bugfix

* drivers/ocp2scp:
  drivers: bus: omap_l3: use resources instead of hardcoded irqs

Signed-off-by: Olof Johansson <olof@lixom.net>