diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-24 01:12:17 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-24 01:12:17 (GMT) |
commit | 35f95d228e55eebdc87b5c0dbdecc46884f476a6 (patch) | |
tree | d1dfa893579e0c4fd6ad9c2990f3bf49f086c2e0 /drivers/edac/mce_amd_inj.c | |
parent | 5e351cdc998db82935d1248a053a1be37d1160fd (diff) | |
parent | 851462444d421c223965b12b836bef63da61b57f (diff) | |
download | linux-fsl-qoriq-35f95d228e55eebdc87b5c0dbdecc46884f476a6.tar.xz |
Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6
Pull MTD fixes from David Woodhouse:
"The most important part of this is that it fixes a regression in
Samsung NAND chip detection, introduced by some rework which went into
3.7. The initial fix wasn't quite complete, so it's in two parts. In
fact the first part is committed twice (Artem committed his own copy
of the same patch) and I've merged Artem's tree into mine which
already had that fix.
I'd have recommitted that to make it somewhat cleaner, but figured by
this point in the release cycle it was better to merge *exactly* the
commits which have been in linux-next.
If I'd recommitted, I'd also omit the sparse warning fix. But it's
there, and it's harmless — just marking one function as 'static' in
onenand code.
This also includes a couple more fixes for stable: an AB-BA deadlock
in JFFS2, and an invalid range check in slram."
* tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
mtd: nand: fix Samsung SLC detection regression
mtd: nand: fix Samsung SLC NAND identification regression
jffs2: Fix lock acquisition order bug in jffs2_write_begin
mtd: onenand: Make flexonenand_set_boundary static
mtd: slram: invalid checking of absolute end address
mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
mtd: nand: fix Samsung SLC NAND identification regression
Diffstat (limited to 'drivers/edac/mce_amd_inj.c')
0 files changed, 0 insertions, 0 deletions