Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 27 Apr 2007 17:42:35 +0000 (10:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 27 Apr 2007 17:42:35 +0000 (10:42 -0700)
commitb928ed56182b8ea59bd43f2d5b865f13a54d5719
treee9ba0ff9d316bdb84d6f2718d4543fd4213ba061
parentea6db58f3ea55f413c882095d2afaea8137f4f8c
parentd468a030026017008286919aa6127b1190efb2c2
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBI: remove unused variable
  UBI: add me to MAINTAINERS
  JFFS2: add UBI support
  UBI: Unsorted Block Images
MAINTAINERS