Merge branch 'master' into 85xx
authorKumar Gala <galak@kernel.crashing.org>
Sat, 17 Feb 2007 16:18:34 +0000 (10:18 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Sat, 17 Feb 2007 16:18:34 +0000 (10:18 -0600)

Trivial merge