Merge branch 'master' into upstream-fixes

Documentation/fb/imacfb.txt

Documentation/kobject.txt

Documentation/networking/ip-sysctl.txt

Documentation/powerpc/booting-without-of.txt

MAINTAINERS

Makefile

arch/arm/common/rtctime.c

arch/arm/kernel/traps.c

arch/arm/mach-ixp4xx/common-pci.c

arch/arm/mach-ixp4xx/gtwx5715-setup.c

arch/i386/kernel/traps.c

arch/ia64/kernel/traps.c

arch/powerpc/Kconfig

arch/powerpc/boot/dts/mpc8641_hpcn.dts

arch/powerpc/configs/g5_defconfig

arch/powerpc/configs/iseries_defconfig

arch/powerpc/configs/pseries_defconfig

arch/powerpc/kernel/Makefile

arch/powerpc/kernel/cpu_setup_power4.S

arch/powerpc/kernel/crash.c