summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-272-2/+2
|\
| * ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.hRussell King2011-08-082-2/+2
* | doc: fix broken referencesPaul Bolle2011-09-271-1/+1
* | UBI: do not link debug messages when debugging is disabledArtem Bityutskiy2011-08-191-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-257-13/+14
|\
| * Merge branch 'master' into for-nextJiri Kosina2011-07-111-3/+3
| |\
| * | Change Ryan Mallon's email address across the kernelRyan Mallon2011-06-161-2/+2
| * | treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches2011-06-106-11/+12
* | | VFS : mount lock scalability for internal mountsTim Chen2011-07-241-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2011-07-221-3/+7
|\ \ \
| * | | fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlersJosef Bacik2011-07-201-3/+7
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2011-07-221-0/+1
|\ \ \
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-07-051-3/+3
| |\| |
| * | | net: remove mm.h inclusion from netdevice.hAlexey Dobriyan2011-06-211-0/+1
| | |/ | |/|
* | | Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6Linus Torvalds2011-07-229-104/+398
|\ \ \ | |_|/ |/| |
| * | UBI: remove dead codeArtem Bityutskiy2011-06-071-13/+3
| * | UBI: dump stack when switching to R/O modeArtem Bityutskiy2011-06-011-0/+1
| * | UBI: fix oops in error pathArtem Bityutskiy2011-06-011-0/+2
| * | UBI: switch debugging tests knobs to debugfsArtem Bityutskiy2011-06-012-28/+49
| * | UBI: make it possible to use struct ubi_device in debug.hArtem Bityutskiy2011-06-012-9/+2
| * | UBI: prepare debugging stuff to further debugfs conversionArtem Bityutskiy2011-06-013-13/+20
| * | UBI: use debugfs for the extra checks knobsArtem Bityutskiy2011-06-019-36/+310
| * | UBI: change the interface of a debugging check functionArtem Bityutskiy2011-05-311-13/+19
| |/
* / powerpc/85xx: fix NAND_CMD_READID read bytes numberShaohui Xie2011-06-221-3/+3
|/
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-05-27130-1592/+995
|\
| * mtd: kill CONFIG_MTD_PARTITIONSJamie Iles2011-05-255-27/+8
| * mtd: remove add_mtd_partitions, add_mtd_device and friendsJamie Iles2011-05-253-5/+9
| * mtd: convert remaining users to mtd_device_register()Jamie Iles2011-05-2559-147/+157
| * mtd: samsung onenand: convert to mtd_device_register()Jamie Iles2011-05-251-9/+3
| * mtd: omap2 onenand: convert to mtd_device_register()Jamie Iles2011-05-251-7/+3
| * mtd: txx9ndfmc: convert to mtd_device_register()Jamie Iles2011-05-251-13/+1
| * mtd: tmio_nand: convert to mtd_device_register()Jamie Iles2011-05-251-9/+1
| * mtd: socrates_nand: convert to mtd_device_register()Jamie Iles2011-05-251-15/+1
| * mtd: sharpsl: convert to mtd_device_register()Jamie Iles2011-05-251-10/+2
| * mtd: s3c2410 nand: convert to mtd_device_register()Jamie Iles2011-05-251-14/+2
| * mtd: ppchameleonevb: convert to mtd_device_register()Jamie Iles2011-05-251-10/+5
| * mtd: orion_nand: convert to mtd_device_register()Jamie Iles2011-05-251-13/+1
| * mtd: omap2: convert to mtd_device_register()Jamie Iles2011-05-251-7/+3
| * mtd: nomadik_nand: convert to mtd_device_register()Jamie Iles2011-05-251-6/+1
| * mtd: ndfc: convert to mtd_device_register()Jamie Iles2011-05-251-12/+1
| * mtd: mxc_nand: convert to mtd_device_register()Jamie Iles2011-05-251-9/+4
| * mtd: mpc5121_nfc: convert to mtd_device_register()Jamie Iles2011-05-251-11/+1
| * mtd: jz4740_nand: convert to mtd_device_register()Jamie Iles2011-05-251-9/+1
| * mtd: h1910: convert to mtd_device_register()Jamie Iles2011-05-252-5/+2
| * mtd: fsmc_nand: convert to mtd_device_register()Jamie Iles2011-05-251-21/+4
| * mtd: fsl_upm: convert to mtd_device_register()Jamie Iles2011-05-251-11/+1
| * mtd: fsl_elbc_nand: convert to mtd_device_register()Jamie Iles2011-05-251-11/+1
| * mtd: edb7312 nand: convert to mtd_device_register()Jamie Iles2011-05-251-8/+1
| * mtd: diskonchip: convert to mtd_device_register()Jamie Iles2011-05-251-11/+7
| * mtd: davinci_nand: convert to mtd_device_register()Jamie Iles2011-05-251-30/+21