Merge git://git.infradead.org/~dedekind/ubi-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 3 Feb 2008 11:07:40 +0000 (22:07 +1100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 3 Feb 2008 11:07:40 +0000 (22:07 +1100)

Trivial merge