]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb71c689882f2b59fb3ec9fb261cd252a4e3adc89
tree0c3f2029c3033d5923cf8b8c86c7b4302f44262d
parent39a69283805f7160bac4cfb0cf4469e9b6caee85
parent09c1145ffba644b0930946fc3976e19ce0230e02
Merge branch 's3c-iis-header' into for-2.6.30

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