From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:33:55 +0000 (-0700)
Subject: Merge branch 'next/drivers' into HEAD
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b1a13b02812b60b88920801363920956691feb3;p=pandora-kernel.git

Merge branch 'next/drivers' into HEAD

Conflicts:
	arch/arm/boot/dts/omap4.dtsi
	arch/arm/mach-clps711x/common.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/leds-h2p2-debug.c
	arch/arm/mach-omap1/leds.c
	arch/arm/mach-pnx4008/time.c
	arch/arm/plat-omap/debug-leds.c
	drivers/Makefile
	drivers/bus/omap_l3_noc.c
---

8b1a13b02812b60b88920801363920956691feb3
Reading git-diff-tree failed