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> |
||
|---|---|---|
| .. | ||
| cfi_cmdset_0001.c | ||
| cfi_cmdset_0002.c | ||
| cfi_cmdset_0020.c | ||
| cfi_probe.c | ||
| cfi_util.c | ||
| chipreg.c | ||
| fwh_lock.h | ||
| gen_probe.c | ||
| jedec_probe.c | ||
| Kconfig | ||
| Makefile | ||
| map_absent.c | ||
| map_ram.c | ||
| map_rom.c | ||