Merge branch 'master' into for-linus
[pandora-kernel.git] / arch / arm / mach-vexpress / include / mach / hardware.h
1 /* empty */