From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 04:57:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20120430~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=672de43a7b0ab3bb3b36eb0ad1a67e0973201197;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-lpc32xx/common.c
---

672de43a7b0ab3bb3b36eb0ad1a67e0973201197