Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/sparc

Makefile

arch/sparc/include/asm/Kbuild

arch/sparc/include/asm/agp.h

arch/sparc/include/asm/apb.h

arch/sparc/include/asm/apc.h

arch/sparc/include/asm/asi.h

arch/sparc/include/asm/asmmacro.h

arch/sparc/include/asm/atomic.h

arch/sparc/include/asm/atomic_32.h

arch/sparc/include/asm/atomic_64.h

arch/sparc/include/asm/auxio.h

arch/sparc/include/asm/auxio_32.h

arch/sparc/include/asm/auxio_64.h

arch/sparc/include/asm/auxvec.h

arch/sparc/include/asm/backoff.h

arch/sparc/include/asm/bbc.h

arch/sparc/include/asm/bitext.h

arch/sparc/include/asm/bitops.h

arch/sparc/include/asm/bitops_32.h

arch/sparc/include/asm/bitops_64.h