Merge branch 'master' of git://git.infradead.org/ubi-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 18 Oct 2008 10:47:37 +0000 (11:47 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 18 Oct 2008 10:47:37 +0000 (11:47 +0100)

Trivial merge