Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Tue, 11 Jan 2011 04:05:15 +0000 (13:05 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 11 Jan 2011 04:05:15 +0000 (13:05 +0900)
commit89e9fd32c6f4ed58cd6f6e3c3cf5b536a3f36100
tree8117c319cd5d24132f10756e0993061c47515b2e
parent239f6dcbab35c90240edf47293cec6e33ea2cf9a
parent2f5998610ae315fa659ebe2ae0f1c02203b63d9a
parent54b384634f7083bcacf9a9ed2e6f4c3d0a246e49
Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest
include/linux/mmc/sh_mmcif.h