Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jan 2012 18:31:33 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jan 2012 18:31:33 +0000 (10:31 -0800)
commit94b1984ab9ab61cc6047c07e074d766485299a9c
tree4b6cba21caf3d99129bea6a5eba0544b2fe8402a
parent1a52bb0b686844021597d190e562ab55d1210104
parent515315a123af641a9533e4ff0f178c470dc08fc7
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
fs/ubifs/tnc.c