Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 03:04:51 +0000 (13:04 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 03:04:51 +0000 (13:04 +1000)
commit70d1f365568e0cdbc9f4ab92428e1830fdb09ab0
tree5cb3ebcaf1a75f19c1026c31213df04cf5f5936b
parent54e74b87e2a9941c6fa82189f270b47cceeba714
parent3a0592b1dd69cfc403ee7514c47b9d57d8bbd6d7
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  Revert "UBI: use mtd->writebufsize to set minimal I/O unit size"