The following commit has been merged in the linux branch: commit 59f4122778efd931d17c9a9ef93b3b47d55e8a32 Merge: e281e315f438093cbf27b4acdee364e781337a7a 774b1382106529ad963d011931c1b911db05be68 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 08:15:34 2009 -0700

Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6: UBI: fix check on unsigned long UBI: fix backward compatibility