From: Tony Lindgren <tony@atomide.com>
Date: Tue, 10 Jul 2012 07:42:24 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-part2-for-v3.6' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cada70ea3b45ca028ac7d5745a6a1dbcd2b7e6b8;p=pandora-kernel.git

Merge tag 'omap-cleanup-part2-for-v3.6' into tmp-merge

This branch contains more clean-up like changes and minor fixes for making
it easier to support new omap SoCs, such as omap5 and am33xx.

This branch has dependencies to earlier clean-up in omap-cleanup-for-v3.6
and  omap-devel-dmtimer-for-v3.6 branches, and also depends on the
omap-devel-am33xx-for-v3.6 branch, and are based on a merge of these
branches.

Conflicts:
	arch/arm/mach-omap2/prm2xxx_3xxx.h
---

cada70ea3b45ca028ac7d5745a6a1dbcd2b7e6b8
Reading git-diff-tree failed