]> err.no Git - linux-2.6/commitdiff
Merge branch '85xx' into for_paulus
authorKumar Gala <galak@kernel.crashing.org>
Sat, 17 Feb 2007 22:32:46 +0000 (16:32 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Sat, 17 Feb 2007 22:32:46 +0000 (16:32 -0600)

Trivial merge