Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...
[cascardo/linux.git] / Documentation / sparc /
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2