Merge branch 'master' into for-next
Jiri Kosina [Wed, 4 Aug 2010 13:14:38 +0000 (15:14 +0200)]
16 files changed:
1  2 
Documentation/feature-removal-schedule.txt
arch/arm/mach-imx/dma-v1.c
arch/powerpc/platforms/ps3/htab.c
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/apic/apic.c
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
drivers/gpu/drm/drm_edid.c
drivers/infiniband/hw/cxgb4/qp.c
drivers/net/gianfar.c
drivers/net/ll_temac_main.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/usb/class/cdc-acm.c
include/linux/netdevice.h
kernel/debug/debug_core.c
kernel/debug/gdbstub.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge