diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:04:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:04:59 -0400 |
| commit | 95985725367e55642755ca6986d0c930cd3738e2 (patch) | |
| tree | e8c8627bc782fa39f42ab3d099e92ebdb8261026 /block/blk-core.c | |
| parent | 4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e (diff) | |
| parent | 9d9659b6c0ebf7dde65ebada4c67980818245913 (diff) | |
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
mmc: Add MMC_PROGRESS_*
mmc, ARM: Rename SuperH Mobile ARM zboot helpers
ARM: mach-shmobile: add coherent DMA mask to CEU camera devices
ARM: mach-shmobile: Dynamic backlight control for Mackerel
Diffstat (limited to 'block/blk-core.c')
0 files changed, 0 insertions, 0 deletions