From: Simon Horman <horms@verge.net.au>
Date: Thu, 8 Nov 2012 08:49:35 +0000 (+0900)
Subject: Merge branch 'soc' into boards
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~40^2~1^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3ff12a78a64b851ab22726ab99dca6ad37bf94;p=pandora-kernel.git

Merge branch 'soc' into boards

Conflicts:
	arch/arm/configs/marzen_defconfig
---

ab3ff12a78a64b851ab22726ab99dca6ad37bf94
Reading git-diff-tree failed