summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-226-7/+7
|\
| * ARM: samsung: move platform_data definitionsArnd Bergmann2012-09-191-1/+1
| * ARM: orion: move platform_data definitionsArnd Bergmann2012-09-191-1/+1
| * ARM: nomadik: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| * ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| * ARM: imx: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| * ARM: davinci: move platform_data definitionsArnd Bergmann2012-09-141-2/+2
* | Merge branch 'next/dt' into next/multiplatformOlof Johansson2012-09-201-15/+72
|\ \
| * \ Merge tag 'omap-devel-dt-merged-for-v3.7' of git://git.kernel.org/pub/scm/lin...Olof Johansson2012-09-204-95/+250
| |\ \
| * \ \ Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horm...Olof Johansson2012-09-053-8/+6
| |\ \ \ | | | |/ | | |/|
| * | | mtd: nand: append missing parameter and valueHaojian Zhuang2012-08-201-2/+2
| * | | MTD: pxa3xx-nand: add devicetree bindingsDaniel Mack2012-08-161-14/+71
* | | | ARM: OMAP1: Move board-ams-delta.h from plat to machTony Lindgren2012-09-201-1/+1
* | | | ARM: omap: move platform_data definitionsArnd Bergmann2012-09-192-2/+2
* | | | Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/l...Olof Johansson2012-09-162-2/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | ARM: OMAP2+: Prepare for irqs.h removalTony Lindgren2012-09-121-0/+1
| * | | ARM: OMAP: Move gpio.h to include/linux/platform_dataTony Lindgren2012-09-121-2/+6
| | | |
| | \ \
| *-. \ \ Merge tags 'omap-devel-gpmc-fixed-for-v3.7' and 'cleanup-omap-tags-for-v3.7' ...Tony Lindgren2012-09-123-93/+243
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/...Olof Johansson2012-09-162-4/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | ARM: OMAP: remove plat/board.h fileIgor Grinberg2012-09-101-2/+0
| * | | | UBI: fix a horrible memory deallocation bugArtem Bityutskiy2012-09-041-2/+2
| |/ / /
* | | | Merge tag 'omap-devel-gpmc-fixed-for-v3.7' of git://git.kernel.org/pub/scm/li...Olof Johansson2012-09-162-89/+241
|\ \ \ \ | | |/ / | |/| |
| * | | mtd: nand: omap2: use gpmc provided irqsAfzal Mohammed2012-08-301-28/+50
| * | | mtd: onenand: omap2: obtain memory from resourceAfzal Mohammed2012-08-301-13/+16
| * | | mtd: nand: omap2: obtain memory from resourceAfzal Mohammed2012-08-301-4/+15
| * | | mtd: nand: omap2: handle nand on gpmcAfzal Mohammed2012-08-301-45/+161
| |/ /
* | | Merge branch 'cleanup/io-pci' into next/cleanupArnd Bergmann2012-09-043-8/+6
|\ \ \ | |/ /
| * | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-08-122-5/+4
| |\ \
| | * \ Merge branch 'testing/new-warnings' into fixesArnd Bergmann2012-08-101-4/+3
| | |\ \
| | | * | mtd/omap2: fix dmaengine_slave_config error handlingArnd Bergmann2012-08-101-4/+3
| | | |/
| | * | ARM: imx: gpmi-nand depends on mxs-dmaArnd Bergmann2012-08-091-1/+1
| | |/
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2012-08-031-3/+2
| |\ \ | | |/ | |/|
| | * mtd/uclinux: Use generic __bss_stop instead of _ebssGeert Uytterhoeven2012-06-271-3/+2
* | | Merge branch 'testing/bcmring' into next/cleanupsArnd Bergmann2012-08-132-43/+42
|\ \ \ | |/ / |/| |
| * | ARM: bcmring: use proper MMIO accessorsArnd Bergmann2012-05-022-42/+41
| * | ARM: bcmring: move cfg_global header to mach/Arnd Bergmann2012-05-021-1/+1
* | | Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-011-50/+56
|\ \ \
| * | | mtd: omap2: remove private DMA API implementationRussell King2012-07-311-110/+26
| * | | mtd: omap2: add DMA engine supportRussell King2012-07-311-1/+91
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-07-301-36/+192
|\ \ \ \
| * | | | MTD: NAND: JZ4740: Multi-bank support with autodetectionMaarten ter Huurne2012-07-231-36/+192
* | | | | Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixesArnd Bergmann2012-07-251-1/+5
|\ \ \ \ \
| * | | | | ARM: Kirkwood: Replace mrvl with marvellAndrew Lunn2012-07-251-1/+1
| * | | | | ARM: Orion: fix driver probe error handling with respect to clkSimon Baatz2012-07-251-0/+4
| |/ / / /
* | | | | Merge tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubiLinus Torvalds2012-07-235-21/+29
|\ \ \ \ \
| * | | | | UBI: harmonize the update of ubi->beb_rsvd_pebsShmulik Ladkani2012-07-183-18/+26
| * | | | | UBI: trivial: fix comment of ubi_calculate_reserved functionShmulik Ladkani2012-07-181-1/+1
| * | | | | UBI: fix spelling of detach in debug outputPeter Meerwald2012-07-181-1/+1
| * | | | | UBI: Change the default percentage of reserved PEBRichard Genoud2012-07-181-1/+1
| |/ / / /
* | | | | VFS: Pass mount flags to sget()David Howells2012-07-141-3/+1
|/ / / /
OpenPOWER on IntegriCloud