From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 12 Nov 2012 20:57:52 +0000 (+0100)
Subject: Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~40^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd2e1dd7bb2e4f19e063aff9194b795be8510464;p=pandora-kernel.git

Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2

These are all dependencies for the renesas/boards2 branch.

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

fd2e1dd7bb2e4f19e063aff9194b795be8510464
Reading git-diff-tree failed