Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release
[linux-2.6] / arch / arm / mach-integrator / clock.h