67577927e8
Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> |
||
|---|---|---|
| .. | ||
| clkdev.h | ||
| coh901318.h | ||
| debug-macro.S | ||
| dma_channels.h | ||
| entry-macro.S | ||
| gpio.h | ||
| hardware.h | ||
| io.h | ||
| irqs.h | ||
| memory.h | ||
| platform.h | ||
| syscon.h | ||
| system.h | ||
| timex.h | ||
| u300-regs.h | ||
| uncompress.h | ||
| vmalloc.h | ||