Merge branch '85xx'
authorKumar Gala <galak@kernel.crashing.org>
Tue, 4 Apr 2006 21:11:29 +0000 (16:11 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 4 Apr 2006 21:11:29 +0000 (16:11 -0500)

Trivial merge