From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Jan 2012 19:25:41 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a520458fccc5f5dd4d0ed63c0602db2fd3172b21;p=mv-sheeva.git

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBI: use own macros for the layout volume
  UBI: fix nameless volumes handling
  UBIFS: fix non-debug configuration build
---

a520458fccc5f5dd4d0ed63c0602db2fd3172b21