summaryrefslogtreecommitdiff
path: root/net/nfc/hci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 20:04:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 20:04:09 -0800
commit060e8e3b6f8fc0ba97de2276249fbd80fa25b0a2 (patch)
treef36d3ccd0fa20f98c694c09ab9b07ec3db0a00f6 /net/nfc/hci
parent271bf66d4c0c8db29764d241e4e46883d9c0a198 (diff)
parent2c7ca5cc3624e05a5235f70039adce30725972d6 (diff)
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 'net/nfc/hci')
0 files changed, 0 insertions, 0 deletions