Merge branch 'master' into upstream

Documentation/feature-removal-schedule.txt

Documentation/x86_64/boot-options.txt

arch/i386/kernel/process.c

arch/i386/kernel/time.c

arch/i386/kernel/traps.c

arch/s390/defconfig

arch/sparc/kernel/time.c

arch/sparc64/mm/fault.c

arch/x86_64/ia32/ia32entry.S

arch/x86_64/kernel/time.c

arch/x86_64/kernel/traps.c

block/blktrace.c

block/cfq-iosched.c

drivers/block/cciss.c

drivers/bluetooth/hci_usb.c

drivers/cpufreq/cpufreq.c

drivers/cpufreq/cpufreq_conservative.c

drivers/cpufreq/cpufreq_ondemand.c

drivers/cpufreq/cpufreq_userspace.c

drivers/ide/ide-disk.c