OSDN Git Service

Merge branches 'omap1-upstream' and 'omap2-upstream' into devel