Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2011 14:44:22 +0000 (07:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Apr 2011 14:44:22 +0000 (07:44 -0700)
commita970f5d513163a305d46f330d0a7d2dd4c4506f1
treeb1f38ab9d31670b909c079ac743651162d2a2e70
parent7ebfa57f6d307b66bb88600145afccde31016ab5
parent1dcffad74183bb00e8129ba1c5bb2c9931d31bd7
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