aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
Commit message (Expand)AuthorAgeFilesLines
* Delete zero-length file drivers/mtd/maps/omap_nor.cJeff Garzik2010-03-191-0/+0
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-03-121-1/+1
|\
| * Merge branch 'for-next' into for-linusJiri Kosina2010-03-081-1/+1
| |\
| | * Fix spelling of 'platform' in comments and docStefan Weil2010-02-051-1/+1
* | | Merge branch 'master' into for-linusRussell King2010-03-081-1/+1
|\ \ \ | |/ / |/| |
| * | MTD: fix pismo build errorRussell King2010-03-011-1/+1
| |/
* | Merge with mainline to remove plat-omap/Kconfig conflictTony Lindgren2010-03-013-173/+0
|\ \
| * | MIPS: Alchemy: physmap-flash for all devboardsManuel Lauss2010-02-273-173/+0
| |/
* | MTD: remove no longer used OMAP flash mapLadislav Michl2010-02-153-198/+0
|/
* Merge git://git.infradead.org/~dwmw2/mtd-2.6.33Linus Torvalds2010-01-242-0/+337
|\
| * mtd: Really add ARM pismo supportRussell King - ARM Linux2010-01-132-0/+337
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-12-171-2/+11
|\ \ | |/ |/|
| * ARM: 5848/1: kill flush_ioremap_region()Nicolas Pitre2009-12-141-2/+11
* | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2009-12-167-487/+19
|\ \ | |/ |/|
| * mtd: add ARM pismo supportRussell King - ARM Linux2009-11-301-0/+1
| * mtd: error return -EIO instead of EIORoel Kluin2009-11-302-2/+2
| * mtd: ixp4xx map: use resource_sizeTobias Klauser2009-11-301-3/+3
| * mtd: vmu-flash: Use hweight_longAkinobu Mita2009-11-201-4/+3
| * mtd: Fix compile failure and error path in physmap.cH Hartley Sweeten2009-10-211-23/+21
| * mtd: Fix kernel NULL pointer dereference in physmap.cH Hartley Sweeten2009-10-201-24/+25
| * pcmcia: convert pcmciamtd driver to use new CIS helpersDominik Brodowski2009-10-191-84/+91
| * mtd: maps: remove obsolete ipaq-flash driverDmitry Artamonow2009-10-173-467/+0
| * mtd: maps/sa1100: fix section mismatchDmitry Artamonow2009-10-171-1/+1
| * mtd: Fix warning in sa1100-flash.cRussell King2009-09-271-2/+2
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-12-091-5/+3
|\ \
| * \ Merge branch 'for-next' into for-linusJiri Kosina2009-12-071-5/+3
| |\ \
| | * | mtd: Fix comment in KconfigKrzysztof Halasa2009-12-041-3/+3
| | * | Kconfig: Remove useless and sometimes wrong commentsMichael Roth2009-11-091-2/+0
* | | | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-12-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge 7xx-iosplit-plat-merge with omap-fixesTony Lindgren2009-11-221-1/+1
| |\ \ \
| | * | | omap: headers: Move remaining headers from include/mach to include/platTony Lindgren2009-10-201-1/+1
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-051-99/+98
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | pcmcia: pcmcia_request_window() doesn't need a pointer to a pointerDominik Brodowski2009-11-281-1/+1
| * | | | pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()Magnus Damm2009-11-281-1/+1
| * | | | pcmcia: Pass struct pcmcia_device to pcmcia_release_window()Magnus Damm2009-11-281-1/+1
| * | | | pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (misc drivers)Dominik Brodowski2009-11-091-12/+2
| * | | | pcmcia: convert pcmciamtd driver to use new CIS helpersDominik Brodowski2009-11-081-84/+93
| |/ / /
* | | | ARM: Fix warning in sa1100-flash.cRussell King2009-11-161-2/+2
* | | | mtd/maps: Fix accidental removal in MakefileAtsushi Nemoto2009-11-091-0/+2
| |/ / |/| |
* | | Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32Linus Torvalds2009-11-052-3/+3
|\ \ \ | |/ / |/| / | |/
| * mtd/maps: gpio-addr-flash: depend on GPIO arch supportMike Frysinger2009-09-241-0/+1
| * mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/Mike Frysinger2009-09-241-3/+2
* | Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2009-09-241-1/+1
|\ \ | |/ |/|
| * mtd: Enable Open Firmware initialisation of MTD devices and maps for MicroBlazeJohn Williams2009-09-211-1/+1
* | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2009-09-237-30/+406
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2009-09-206-7/+7
| |\ \ | | |/
| * | mtd: maps: add mtd-ram support to physmap_ofWolfram Sang2009-09-191-0/+4
| * | mtd/maps: gpio-addr-flash: new driver for GPIO assisted flash addressingMike Frysinger2009-09-193-2/+322
| * | mtd/maps: uclinux: depend on MTD_RAM being built into the kernelMike Frysinger2009-09-191-1/+1
| * | mtd/maps: uclinux: fix building when partition support is disabledTimofei Bondarenko2009-09-191-0/+8