Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:14:38 +0000 (15:14 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:14:38 +0000 (15:14 +0200)
commitd790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f
tree854ab394486288d40fa8179cbfaf66e8bdc44b0f
parent73b2c7165b76b20eb1290e7efebc33cfd21db1ca
parent3a09b1be53d23df780a0cd0e4087a05e2ca4a00c
Merge branch 'master' into for-next
16 files changed:
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