Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 25 Jul 2008 14:40:14 +0000 (10:40 -0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 25 Jul 2008 14:40:14 +0000 (10:40 -0400)

Trivial merge