Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-drm-fsl-dcu.git] / Documentation / parisc /
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2