tree 4b6cba21caf3d99129bea6a5eba0544b2fe8402a
parent 1a52bb0b686844021597d190e562ab55d1210104
parent 515315a123af641a9533e4ff0f178c470dc08fc7
author Linus Torvalds <torvalds@linux-foundation.org> 1326479493 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326479493 -0800

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