summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6Linus Torvalds2010-10-2213-286/+419
|\
| * UBI: tighten the corrupted PEB criteriaArtem Bityutskiy2010-10-211-11/+34
| * UBI: fix check_data_ff return codeArtem Bityutskiy2010-10-211-2/+5
| * UBI: remember copy_flag while scanningArtem Bityutskiy2010-10-212-11/+13
| * UBI: preserve corrupted PEBsArtem Bityutskiy2010-10-197-47/+45
| * UBI: add truly corrupted PEBs to corrupted listArtem Bityutskiy2010-10-191-2/+74
| * UBI: introduce debugging helper functionArtem Bityutskiy2010-10-191-0/+4
| * UBI: make check_pattern function non-staticArtem Bityutskiy2010-10-193-24/+26
| * UBI: do not put eraseblocks to the corrupted list unnecessarilyArtem Bityutskiy2010-10-193-72/+90
| * UBI: separate out corrupted listArtem Bityutskiy2010-10-191-11/+34
| * UBI: change cascade of ifs to switch statementsArtem Bityutskiy2010-10-191-13/+32
| * UBI: rename a local variableArtem Bityutskiy2010-10-191-7/+7
| * UBI: handle bit-flips when no header foundArtem Bityutskiy2010-10-194-27/+51
| * UBI: remove duplicate IO error codesArtem Bityutskiy2010-10-194-48/+13
| * UBI: rename IO error codeArtem Bityutskiy2010-10-195-24/+30
| * UBI: fix small 80 characters limit style issueArtem Bityutskiy2010-10-191-2/+2
| * UBI: cleanup and simplify KconfigH Hartley Sweeten2010-10-192-36/+10
* | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds2010-10-2221-112/+362
|\ \
| * | UBIFS: do not allocate unneeded scan bufferArtem Bityutskiy2010-10-211-7/+1
| * | UBIFS: do not forget to cancel timersArtem Bityutskiy2010-10-211-0/+4
| * | UBIFS: remove a bit of unneeded codeArtem Bityutskiy2010-10-211-6/+3
| * | UBIFS: add a commentary about log recoveryArtem Bityutskiy2010-10-172-5/+7
| * | UBIFS: avoid kernel error if ubifs superblock read failsSteffen Sledz2010-09-281-2/+2
| * | UBIFS: introduce new flags for RO mountsArtem Bityutskiy2010-09-1914-60/+62
| * | UBIFS: introduce new flag for RO due to errorsArtem Bityutskiy2010-09-1711-24/+44
| * | UBIFS: check return code of pnode_lookupVasiliy Kulikov2010-09-071-0/+3
| * | UBIFS: check return code of ubifs_lpt_lookupVasiliy Kulikov2010-09-071-1/+6
| * | UBIFS: improve error reporting when reading bad nodeArtem Bityutskiy2010-08-301-1/+2
| * | UBIFS: introduce list sorting debugging checksArtem Bityutskiy2010-08-303-2/+168
| * | UBIFS: fix assertion warnings in comparison functionArtem Bityutskiy2010-08-301-0/+6
| * | UBIFS: mark unused key objects as invalidArtem Bityutskiy2010-08-304-3/+27
| * | UBIFS: do not write rubbish into truncation scanning nodeArtem Bityutskiy2010-08-301-1/+0
| * | UBIFS: improve assertion in node comparison functionsArtem Bityutskiy2010-08-301-0/+11
| * | UBIFS: do not use key type in list_sortArtem Bityutskiy2010-08-301-9/+9
| * | UBIFS: do not look up truncation nodesArtem Bityutskiy2010-08-301-3/+20
| * | UBIFS: fix assertion warningArtem Bityutskiy2010-08-301-1/+2
| * | UBIFS: do not treat ENOSPC speciallyArtem Bityutskiy2010-08-301-7/+5
| * | UBIFS: switch to RO mode after synchronizingArtem Bityutskiy2010-08-301-1/+1
* | | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2010-10-223-2/+5
|\ \ \
| * | | pcmcia: fix ni_daq_700 compilationDominik Brodowski2010-10-221-1/+0
| * | | pcmcia: IOCARD is also required for using IRQsDominik Brodowski2010-10-222-1/+5
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-genericLinus Torvalds2010-10-229-85/+86
|\ \ \ \
| * | | | asm-generic/io.h: allow people to override individual funcsMike Frysinger2010-10-181-0/+26
| * | | | bitops: remove duplicated extern declarationsAkinobu Mita2010-10-092-25/+12
| * | | | bitops: make asm-generic/bitops/find.h more genericAkinobu Mita2010-10-094-22/+28
| * | | | asm-generic: kdebug.h: Checkpatch cleanupAndrea Gelmini2010-10-091-1/+1
| * | | | asm-generic: fcntl: make exported headers use strict posix typesLucian Adrian Grijincu2010-10-091-1/+1
| * | | | asm-generic: cmpxchg does not handle non-long argumentsMathieu Lacage2010-10-091-19/+1
| * | | | asm-generic: make atomic_add_unless a functionMathieu Lacage2010-10-091-17/+17
* | | | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-22370-77/+601
|\ \ \ \ \
OpenPOWER on IntegriCloud