]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 21:20:16 +0000 (16:20 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 21:20:16 +0000 (16:20 -0500)

Trivial merge