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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| amd76xrom.c | ||
| autcpu12-nvram.c | ||
| bcm963xx-flash.c | ||
| bfin-async-flash.c | ||
| cdb89712.c | ||
| ceiva.c | ||
| cfi_flagadm.c | ||
| ck804xrom.c | ||
| dbox2-flash.c | ||
| dc21285.c | ||
| dilnetpc.c | ||
| dmv182.c | ||
| edb7312.c | ||
| esb2rom.c | ||
| fortunet.c | ||
| gpio-addr-flash.c | ||
| h720x-flash.c | ||
| ichxrom.c | ||
| impa7.c | ||
| integrator-flash.c | ||
| intel_vr_nor.c | ||
| ixp4xx.c | ||
| ixp2000.c | ||
| l440gx.c | ||
| map_funcs.c | ||
| mbx860.c | ||
| netsc520.c | ||
| nettel.c | ||
| octagon-5066.c | ||
| pci.c | ||
| pcmciamtd.c | ||
| physmap.c | ||
| physmap_of.c | ||
| pismo.c | ||
| plat-ram.c | ||
| pmcmsp-flash.c | ||
| pxa2xx-flash.c | ||
| rbtx4939-flash.c | ||
| rpxlite.c | ||
| sa1100-flash.c | ||
| sbc_gxx.c | ||
| sc520cdp.c | ||
| scb2_flash.c | ||
| scx200_docflash.c | ||
| solutionengine.c | ||
| sun_uflash.c | ||
| tqm8xxl.c | ||
| ts5500_flash.c | ||
| tsunami_flash.c | ||
| uclinux.c | ||
| vmax301.c | ||
| vmu-flash.c | ||
| wr_sbc82xx_flash.c | ||