Merge remote-tracking branch 'spi/fix/core' into spi-linus
[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / pxa25x-udc.h