Merge tag 'v2.6.35-rc4' into drm-testing

2026-09-26 18:16:26 +00:00 · 2010-07-07 18:37:34 +10:00 · 2010-07-07 18:37:34 +10:00 · 6dbe746571
commit 6dbe746571
parent 023eb571a1 815c4163b6
49 changed files with 511 additions and 599 deletions
--- a/9
+++ b/9
--- a/74
+++ b/74
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/include/asm/mach/udc_pxa2xx.h
+++ b/arch/arm/include/asm/mach/udc_pxa2xx.h
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
--- a/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-mx3/mach-mx31lilly.c
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
--- a/arch/arm/mach-realview/include/mach/barriers.h
+++ b/arch/arm/mach-realview/include/mach/barriers.h
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
--- a/fs/xfs/xfs_trans_inode.c
+++ b/fs/xfs/xfs_trans_inode.c
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c