Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

2026-09-26 18:16:26 +00:00 · 2009-08-15 12:43:13 +01:00 · 2009-08-15 12:43:13 +01:00 · 824df399a3
commit 824df399a3
parent 8b61207895 48ec45e725
66 changed files with 1455 additions and 341 deletions
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/arch/arm/plat-s3c24xx/clock-dclk.c
+++ b/arch/arm/plat-s3c24xx/clock-dclk.c
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
--- a/arch/ia64/include/asm/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
--- a/drivers/mtd/maps/sbc8240.c
+++ b/drivers/mtd/maps/sbc8240.c
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
--- a/fs/xfs/xfs_dir2.c
+++ b/fs/xfs/xfs_dir2.c
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
--- a/kernel/irq/numa_migrate.c
+++ b/kernel/irq/numa_migrate.c
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
--- a/mm/mempool.c
+++ b/mm/mempool.c
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
--- a/tools/perf/Documentation/perf-examples.txt
+++ b/tools/perf/Documentation/perf-examples.txt
--- a/tools/perf/Documentation/perf-stat.txt
+++ b/tools/perf/Documentation/perf-stat.txt
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h