Merge branches 'acpi-video' and 'acpi-x86'
[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / pxa25x-udc.h