Merge rsync://rsync.kernel.org/pub/linux/kernel/people/davem/sparc-2.6.git