Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

2026-10-14 05:55:17 +00:00 · 2011-05-01 19:09:39 +02:00 · 2011-05-01 19:09:39 +02:00 · 809435ff4f
commit 809435ff4f
parent 32673822e4 058e297d34
62 changed files with 639 additions and 290 deletions
--- a/Documentation/sound/alsa/SB-Live-mixer.txt
+++ b/Documentation/sound/alsa/SB-Live-mixer.txt
--- a/2
+++ b/2
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
--- a/fs/ecryptfs/kthread.c
+++ b/fs/ecryptfs/kthread.c
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
--- a/fs/ecryptfs/super.c
+++ b/fs/ecryptfs/super.c
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
--- a/include/linux/bit_spinlock.h
+++ b/include/linux/bit_spinlock.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/list_bl.h
+++ b/include/linux/list_bl.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
--- a/security/capability.c
+++ b/security/capability.c
--- a/security/security.c
+++ b/security/security.c
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
--- a/security/selinux/include/avc.h
+++ b/security/selinux/include/avc.h
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
--- a/sound/soc/tegra/harmony.c
+++ b/sound/soc/tegra/harmony.c