From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 17 Apr 2012 03:34:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20120417~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2c21365c81bd1c56696258d86dac60a6649711c;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/mach-omap2/board-generic.c
---

a2c21365c81bd1c56696258d86dac60a6649711c