Merge commit 'takashi/fix/asoc' into for-2.6.30
[pandora-kernel.git] / arch / arm / mach-integrator / clock.h