From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 11 Mar 2009 11:12:48 +0000 (+0000)
Subject: Merge branch 's3c-iis-header' into for-2.6.30
X-Git-Tag: firefly_0821_release~14583^2~38
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3c081384007332ab95c8d8753f47719d6646bcb2;p=firefly-linux-kernel-4.4.55.git

Merge branch 's3c-iis-header' into for-2.6.30

Conflicts:
	arch/arm/mach-shark/include/mach/io.h
---

3c081384007332ab95c8d8753f47719d6646bcb2