Merge git://git.infradead.org/~dedekind/ubi-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 23 Apr 2008 08:57:25 +0000 (09:57 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 23 Apr 2008 08:57:25 +0000 (09:57 +0100)

Trivial merge