Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
[pandora-kernel.git] / arch / arm / mach-integrator / clock.h