Merge branch 's3c-iis-header' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 11 Mar 2009 11:12:48 +0000 (11:12 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 11 Mar 2009 11:12:48 +0000 (11:12 +0000)
commit3c081384007332ab95c8d8753f47719d6646bcb2
tree0c3f2029c3033d5923cf8b8c86c7b4302f44262d
parentf455dfb106916d855d59686fe16575c2ceb2cb2a
parenta2b03461cb072eb6097a55ec0289294b09382284
Merge branch 's3c-iis-header' into for-2.6.30

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