Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/misc
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 23 Mar 2007 17:31:17 +0000 (17:31 +0000)
committerDavid Woodhouse <dwmw2@infradead.org>
Fri, 23 Mar 2007 17:31:17 +0000 (17:31 +0000)

Trivial merge