Merge branch 'master' into upstream

arch/frv/Kconfig

arch/frv/kernel/time.c

arch/ia64/kernel/entry.S

arch/ia64/kernel/head.S

arch/ia64/kernel/perfmon.c

arch/ia64/kernel/sys_ia64.c

arch/ia64/sn/kernel/setup.c

arch/sparc/kernel/sys_sparc.c

arch/sparc64/kernel/sys_sparc.c

drivers/ide/ide-proc.c

drivers/ide/pci/sis5513.c

fs/ext3/inode.c

fs/nfs/direct.c

fs/nfs/read.c

fs/nfs/write.c

fs/super.c

include/asm-i386/Kbuild

include/asm-ia64/mman.h

include/asm-ia64/unistd.h

include/asm-sh/page.h