Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
Linus Torvalds [Fri, 27 Apr 2007 17:42:35 +0000 (10:42 -0700)]
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge