tree e9ba0ff9d316bdb84d6f2718d4543fd4213ba061
parent ea6db58f3ea55f413c882095d2afaea8137f4f8c
parent d468a030026017008286919aa6127b1190efb2c2
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1177695755 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1177695755 -0700

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