Merge tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd
[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / pxa25x-udc.h