Merge branch 'master' into upstream-fixes

Makefile

arch/i386/kernel/Makefile

arch/ia64/Kconfig

arch/powerpc/Kconfig

arch/s390/Kconfig

arch/sh64/Makefile

arch/sh64/kernel/process.c

arch/sh64/mach-cayman/setup.c

arch/sh64/mm/ioremap.c

arch/sparc64/Kconfig

arch/sparc64/kernel/Makefile

arch/sparc64/kernel/audit.c

arch/sparc64/kernel/compat_audit.c

arch/x86_64/Kconfig

drivers/media/Kconfig

drivers/media/common/saa7146_video.c

drivers/media/dvb/b2c2/Kconfig

drivers/media/dvb/bt8xx/Kconfig

drivers/media/dvb/dvb-usb/Kconfig

drivers/media/dvb/frontends/Kconfig