summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubiLinus Torvalds2012-10-0217-325/+412
|\
| * UBI: fix trivial typo 'it' => 'is'Brian Norris2012-09-261-1/+1
| * UBI: load after mtd device driversJiang Lu2012-09-261-1/+1
| * UBI: print lessArtem Bityutskiy2012-09-047-56/+42
| * UBI: use pr_ helper instead of printkArtem Bityutskiy2012-09-046-103/+93
| * UBI: comply with coding styleArtem Bityutskiy2012-09-049-113/+101
| * UBI: erase free PEB with bitflip in EC headerMatthieu CASTET2012-09-041-1/+1
| * UBI: fix autoresize handling in R/O modeArtem Bityutskiy2012-09-041-0/+5
| * UBI: add max_beb_per1024 to attach ioctlRichard Genoud2012-09-043-3/+18
| * UBI: allow specifying bad PEBs limit using module parameterRichard Genoud2012-09-042-15/+27
| * UBI: check max_beb_per1024 value in ubi_attach_mtd_devRichard Genoud2012-09-041-0/+9
| * UBI: prepare for max_beb_per1024 module parameter additionRichard Genoud2012-09-043-8/+12
| * UBI: introduce MTD_PARAM_MAX_COUNTRichard Genoud2012-09-041-2/+5
| * UBI: separate bad_peb_limit in a functionRichard Genoud2012-09-041-23/+31
| * arm: sam9_l9260_defconfig: correct CONFIG_MTD_UBI_BEB_LIMITArtem Bityutskiy2012-09-041-1/+1
| * UBI: use the whole MTD device size to get bad_peb_limitRichard Genoud2012-09-042-9/+39
| * mtd: mtdparts: introduce mtd_get_device_sizeRichard Genoud2012-09-042-0/+11
| * mtd: mark mtd_is_partition argument as constantRichard Genoud2012-09-042-2/+2
| * arm: sam9_l9260_defconfig: remove non-existing config optionShmulik Ladkani2012-09-041-1/+0
| * UBI: kill CONFIG_MTD_UBI_BEB_RESERVEShmulik Ladkani2012-09-042-19/+0
| * UBI: limit amount of reserved eraseblocks for bad PEB handlingShmulik Ladkani2012-09-042-21/+41
| * UBI: introduce new bad PEB limitShmulik Ladkani2012-09-043-8/+32
| * arm: sam9_l9260_defconfig: prepare to UBI config changeShmulik Ladkani2012-09-041-0/+1
| * UBI: print PID in debug messagesArtem Bityutskiy2012-09-041-1/+2
| * UBI: print image sequence number as unsigned integerArtem Bityutskiy2012-09-041-1/+1
* | Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifsLinus Torvalds2012-10-0220-578/+451
|\ \
| * | UBIFS: print lessArtem Bityutskiy2012-08-318-70/+60
| * | UBIFS: use pr_ helper instead of printkArtem Bityutskiy2012-08-314-302/+235
| * | UBIFS: comply with coding styleArtem Bityutskiy2012-08-3116-206/+161
| * | UBIFS: use __aligned() attributeArtem Bityutskiy2012-08-311-1/+1
| * | UBIFS: remove __DATE__ and __TIME__Jiri Slaby2012-08-311-1/+0
| * | UBIFS: fix power cut emulation for mtdramArtem Bityutskiy2012-08-311-9/+11
| * | UBIFS: improve scanning debug outputArtem Bityutskiy2012-08-231-4/+4
| * | UBIFS: always print full error reportsArtem Bityutskiy2012-08-222-8/+0
| * | UBIFS: print PID in debug messagesArtem Bityutskiy2012-08-221-2/+4
* | | Merge tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfsLinus Torvalds2012-10-027-80/+447
|\ \ \
| * | | xfs: Make inode32 a remountable optionCarlos Maiolino2012-09-261-1/+9
| * | | xfs: add inode64->inode32 transition into xfs_set_inode32()Carlos Maiolino2012-09-261-3/+12
| * | | xfs: Fix mp->m_maxagi update during inode64 remountCarlos Maiolino2012-09-261-1/+1
| * | | xfs: reduce code duplication handling inode32/64 optionsCarlos Maiolino2012-09-263-62/+72
| * | | xfs: make inode64 as the default allocation modeCarlos Maiolino2012-09-261-0/+7
| * | | xfs: Fix m_agirotor reset during AG selectionCarlos Maiolino2012-09-261-1/+1
| * | | Make inode64 a remountable optionCarlos Maiolino2012-09-261-1/+29
| * | | xfs: stop the sync worker before xfs_unmountfsBen Myers2012-09-171-0/+1
| * | | xfs: xfs_seek_hole() refinement with hole searching from page cache for unwri...Jeff Liu2012-08-241-11/+67
| * | | xfs: xfs_seek_data() refinement with unwritten extents check up from page cacheJeff Liu2012-08-241-18/+54
| * | | xfs: Introduce a helper routine to probe data or hole offset from page cacheJeff Liu2012-08-241-0/+219
| * | | xfs: Remove type argument from xfs_seek_data()/xfs_seek_hole()Jeff Liu2012-08-241-6/+4
| * | | xfs: fix race while discarding buffers [V4]Carlos Maiolino2012-08-242-18/+28
| * | | xfs: check for possible overflow in xfs_ioc_trimTomas Racek2012-08-161-2/+4