Merge ../linux-2.6

This commit is contained in:
Paul Mackerras 2006-01-14 09:15:28 +11:00
commit 25cd6aa0aa
2 changed files with 3 additions and 3 deletions