From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Apr 2011 14:44:22 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v2.6.39-rc4~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=a970f5d513163a305d46f330d0a7d2dd4c4506f1

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

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix compilation warnings when compiling with gcc 4.5
  UBIFS: fix oops when R/O file-system is fsync'ed
---

a970f5d513163a305d46f330d0a7d2dd4c4506f1