summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-05-291-44/+32
|\
| * MTD: MIPS: lantiq: verify that the NOR interface is available on falcon socJohn Crispin2012-05-211-0/+7
| * MTD: MIPS: lantiq: implement OF supportJohn Crispin2012-05-211-44/+25
* | Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-262-3/+21
|\ \
| * \ Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into ...Arnd Bergmann2012-05-161-0/+18
| |\ \
| | * | ARM: Orion: NAND: Add support for clk, if there is one.Andrew Lunn2012-05-081-0/+18
| * | | Merge branch 'imx/pinctrl' into imx/clockArnd Bergmann2012-05-141-0/+10
| |\ \ \
| * | | | mtd mxc_nand: prepare/unprepare clockSascha Hauer2012-04-251-3/+3
| | |/ / | |/| |
* | | | Merge tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifsLinus Torvalds2012-05-2218-1410/+1198
|\ \ \ \
| * | | | UBI: modify ubi_wl_flush function to clear work queue for a lnumJoel Reardon2012-05-216-31/+69
| * | | | UBI: introduce UBI_ALL constantArtem Bityutskiy2012-05-211-5/+5
| * | | | UBI: add lnum and vol_id to struct ubi_workJoel Reardon2012-05-213-18/+33
| * | | | UBI: add volume id struct ubi_ainf_pebJoel Reardon2012-05-212-16/+35
| * | | | UBI: add in hex the value for UBI_INTERNAL_VOL_START to commentJoel Reardon2012-05-201-2/+2
| * | | | UBI: rename scan.c to attach.cArtem Bityutskiy2012-05-202-1/+1
| * | | | UBI: remove scan.hArtem Bityutskiy2012-05-202-174/+147
| * | | | UBI: rename UBI_SCAN_UNKNOWN_ECArtem Bityutskiy2012-05-202-12/+15
| * | | | UBI: move and rename attach_by_scanningArtem Bityutskiy2012-05-204-62/+58
| * | | | UBI: rename _init_scan functionsArtem Bityutskiy2012-05-204-9/+9
| * | | | UBI: amend comments after all the renamingsArtem Bityutskiy2012-05-206-81/+73
| * | | | UBI: rename ubi_scan_leb_slabArtem Bityutskiy2012-05-202-16/+16
| * | | | UBI: rename ubi_scan_move_to_listArtem Bityutskiy2012-05-202-3/+3
| * | | | UBI: rename ubi_scan_destroy_aiArtem Bityutskiy2012-05-203-6/+6
| * | | | UBI: rename ubi_scan_get_free_pebArtem Bityutskiy2012-05-203-6/+6
| * | | | UBI: rename ubi_scan_rm_volumeArtem Bityutskiy2012-05-203-5/+5
| * | | | UBI: rename ubi_scan_find_avArtem Bityutskiy2012-05-204-9/+9
| * | | | UBI: rename ubi_scan_add_usedArtem Bityutskiy2012-05-203-12/+9
| * | | | UBI: remove unused functionArtem Bityutskiy2012-05-202-31/+0
| * | | | UBI: make ubi_scan_erase_peb static and renameArtem Bityutskiy2012-05-202-6/+4
| * | | | UBI: rename sv to avArtem Bityutskiy2012-05-207-182/+182
| * | | | UBI: rename si to aiArtem Bityutskiy2012-05-208-260/+260
| * | | | UBI: rename seb to aebArtem Bityutskiy2012-05-207-196/+196
| * | | | UBI: amend comments after renaming in scan.cArtem Bityutskiy2012-05-201-10/+11
| * | | | UBI: rename struct ubi_scan_infoArtem Bityutskiy2012-05-207-42/+44
| * | | | UBI: rename struct ubi_scan_volumeArtem Bityutskiy2012-05-207-34/+34
| * | | | UBI: rename struct ubi_scan_lebArtem Bityutskiy2012-05-208-37/+37
| * | | | UBI: rename few functions for consistencyArtem Bityutskiy2012-05-203-14/+15
| * | | | UBI: get rid of dbg_errArtem Bityutskiy2012-05-208-54/+52
| * | | | UBI: more of clean-up terminology for self-checksArtem Bityutskiy2012-05-204-54/+49
| * | | | UBI: clean-up terminology for self-checks in io.cArtem Bityutskiy2012-05-201-39/+37
| * | | | UBI: remove Kconfig debugging optionArtem Bityutskiy2012-05-208-120/+0
| * | | | UBI: rename ubi_dbg_dump_mkvol_reqArtem Bityutskiy2012-05-203-5/+5
| * | | | UBI: rename ubi_dbg_dump_sebArtem Bityutskiy2012-05-203-7/+7
| * | | | UBI: rename ubi_dbg_dump_svArtem Bityutskiy2012-05-204-9/+9
| * | | | UBI: rename ubi_dbg_dump_vtbl_recordArtem Bityutskiy2012-05-204-9/+9
| * | | | UBI: rename ubi_dbg_dump_vol_infoArtem Bityutskiy2012-05-204-6/+6
| * | | | UBI: amend commentaries WRT dtypeArtem Bityutskiy2012-05-201-8/+1
| * | | | UBI: Kill data type hintRichard Weinberger2012-05-208-102/+36
| * | | | UBI: remove superfluous "!!" operationRichard Weinberger2012-05-201-1/+1
| * | | | UBI: always warn if case of I/O errorsArtem Bityutskiy2012-05-201-6/+6