From: Olof Johansson Date: Thu, 20 Sep 2012 23:12:47 +0000 (-0700) Subject: Merge branch 'drivers/ocp2scp' into next/drivers X-Git-Tag: v3.7-rc1~156^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ef3f756b069469621a47ded867e71c97e1b483f;p=thirdparty%2Fkernel%2Flinux.git 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 --- 1ef3f756b069469621a47ded867e71c97e1b483f