Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes
[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / pxa25x-udc.h