diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 19:34:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 19:34:48 +0200 |
commit | af9b9a53fa0a86921edb86973f9661ccc7ddb90d (patch) | |
tree | 7750d7ca27f373d1127439dc841171cdbb901a4a /drivers/ide/ide-io.c | |
parent | mm: Hold a file reference in madvise_remove (diff) | |
parent | mtd: cafe_nand: fix an & vs | mistake (diff) | |
download | linux-af9b9a53fa0a86921edb86973f9661ccc7ddb90d.tar.xz linux-af9b9a53fa0a86921edb86973f9661ccc7ddb90d.zip |
Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd
Pull two MTD fixes from David Woodhouse:
- Fix a logic error in OLPC CAFÉ NAND ready() function.
- Fix regression due to bitflip handling changes.
* tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd:
mtd: cafe_nand: fix an & vs | mistake
mtd: nand: initialize bitflip_threshold prior to BBT scanning
Diffstat (limited to 'drivers/ide/ide-io.c')
0 files changed, 0 insertions, 0 deletions