diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-23 21:50:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-23 21:50:40 -0700 |
commit | f4673d6f185533a93990a12d283aead3b0177533 (patch) | |
tree | 24fb0132b26bf92a3ba7ef0b150b86458de1da21 /net/802/hippi.c | |
parent | 270868f6e654b2c37627bba52c62f352735f99ba (diff) | |
parent | 69f9025894c391fec2f7c7ea9150203418454915 (diff) | |
download | linux-f4673d6f185533a93990a12d283aead3b0177533.tar.gz linux-f4673d6f185533a93990a12d283aead3b0177533.tar.bz2 linux-f4673d6f185533a93990a12d283aead3b0177533.zip |
Merge tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs
Pull UBIFS fixes from Artem Bityutskiy:
- Fix crash on error which prevents emulated power-cut testing.
- Fix log reply regression introduced in 3.6-rc1.
- Fix UBIFS complaints about too small debug buffer size which.
- Fix error message spelling, and remove incorrect commentary.
* tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs:
UBIFS: fix error messages spelling
UBIFS: fix complaints about too small debug buffer size
UBIFS: fix replay regression
UBIFS: fix crash on error path
UBIFS: remove stale commentary
Diffstat (limited to 'net/802/hippi.c')
0 files changed, 0 insertions, 0 deletions