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

Merge branch 'next/cleanup' into HEAD

Conflicts:
	drivers/staging/tidspbridge/core/wdt.c
	drivers/usb/host/Kconfig
	drivers/w1/masters/omap_hdq.c
---

ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8
Reading git-diff-tree failed