Merge davem@sunset.davemloft.net:/home/davem/src/BK/sparc-2.6
into kernel.bkbits.net:/home/davem/sparc-2.6