Merge of davem@nuts.davemloft.net:/disk1/GIT/sparc-2.6/.git/