Merge branch 'msm-fixes-4.6-rc1' of git://people.freedesktop.org/~robclark/linux...
[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / pxa25x-udc.h