diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 05:04:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 05:04:09 +0100 |
| commit | 060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2 (patch) | |
| tree | f36d3ccd0fa20f98c694c09ab9b07ec3db0a00f6 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | UBI: avoid program operation on NOR flash after erasure interrupted (diff) | |
| download | linux-060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2.tar.xz linux-060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2.zip | |
Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs
Pull ubifs updates from Artem Bityutskiy:
- Improve the NOR erasure quirk - now it tries to do as little writes
as possible, because the eraseblock may be in an "unstable" state and
write operation sometimes causes NOR chip lock-ups.
- Both UBI and UBIFS changes are now maintainer in one single tree,
because the amount of changes dropped significantly.
* tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs:
UBI: avoid program operation on NOR flash after erasure interrupted
MAINTAINERS: keep UBI and UBIFS stuff in the same tree
UBI: fix error return code
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
0 files changed, 0 insertions, 0 deletions