From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Oct 2012 01:37:47 +0000 (+1100)
Subject: Merge remote-tracking branch 'renesas/next'
X-Git-Tag: next-20121011~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f47088191e22e5228e660d1054753a7fe60000b;p=karo-tx-linux.git

Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/Kconfig
---

4f47088191e22e5228e660d1054753a7fe60000b