Merge branch 'master' into for-next

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc arch/arm/mach-imx/dma-v1.c
Simple merge

diff --cc arch/powerpc/platforms/ps3/htab.c
Simple merge

diff --cc arch/x86/kernel/acpi/sleep.c
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k8.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/qp.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/ll_temac_main.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_hw.c
Simple merge

diff --cc drivers/serial/cpm_uart/cpm_uart_core.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc kernel/debug/debug_core.c
Simple merge

diff --cc kernel/debug/gdbstub.c
Simple merge