Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: UBIFS: fix key printing UBIFS: use snprintf instead of sprintf when printing keys UBIFS: fix debugging messages UBIFS: make debugging messages light again UBI: fix debugging messages UBI: make vid_hdr non-static
Showing
- drivers/mtd/ubi/debug.h 4 additions, 1 deletiondrivers/mtd/ubi/debug.h
- drivers/mtd/ubi/vtbl.c 1 addition, 1 deletiondrivers/mtd/ubi/vtbl.c
- fs/ubifs/debug.c 46 additions, 44 deletionsfs/ubifs/debug.c
- fs/ubifs/debug.h 25 additions, 19 deletionsfs/ubifs/debug.h
- fs/ubifs/journal.c 3 additions, 4 deletionsfs/ubifs/journal.c
- fs/ubifs/replay.c 4 additions, 4 deletionsfs/ubifs/replay.c
- fs/ubifs/tnc.c 27 additions, 28 deletionsfs/ubifs/tnc.c
- fs/ubifs/tnc_misc.c 5 additions, 5 deletionsfs/ubifs/tnc_misc.c
Loading
Please register or sign in to comment