Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 14:22:42 +0000 (07:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 14:22:42 +0000 (07:22 -0700)
commit777cb1b53dd11dbec6157adc97e9f908f6e8458c
treea7fd28bcbb9196dba327cf56dfceb3b057360a00
parent277a4ed1df42134f66503db837e40f0b583ec63d
parent2fde99cb55fb9d9b88180512a5e8a5d939d27fec
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: mark VFS SB RO too