Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2012 19:25:41 +0000 (11:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Jan 2012 19:25:41 +0000 (11:25 -0800)
commita520458fccc5f5dd4d0ed63c0602db2fd3172b21
tree3bca2be919eac0bfb50bd0623cda6df589260de8
parentc49c41a4134679cecb77362e7f6b59acb6320aa7
parent1f4f43475f1295dc41c18684e59deea9b6d46045
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