Merge branch 'for-linus' of git://dev.laptop.org/users/cjb/mmc
[deliverable/linux.git] / arch / arm / mach-pxa / trizeps4.c
CommitLineData