Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25

This commit is contained in:
Paul Mackerras 2008-01-17 16:17:58 +11:00
commit 52920df4aa
11 changed files with 227 additions and 180 deletions