From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jan 2012 18:31:33 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v3.3-rc1~78
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94b1984ab9ab61cc6047c07e074d766485299a9c;p=platform%2Fkernel%2Flinux-exynos.git

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
---

94b1984ab9ab61cc6047c07e074d766485299a9c