Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6