Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

2026-10-14 05:55:17 +00:00 · 2010-11-19 17:04:25 +09:00 · 2010-11-19 17:04:25 +09:00 · fe040be2fd
commit fe040be2fd
parent 2006920a18 6722a4016d
743 changed files with 10734 additions and 4080 deletions
--- a/Documentation/ABI/obsolete/proc-pid-oom_adj
+++ b/Documentation/ABI/obsolete/proc-pid-oom_adj
--- a/Documentation/arm/OMAP/DSS
+++ b/Documentation/arm/OMAP/DSS
--- a/Documentation/block/switching-sched.txt
+++ b/Documentation/block/switching-sched.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/xfs-delayed-logging-design.txt
+++ b/Documentation/filesystems/xfs-delayed-logging-design.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/leds-class.txt
+++ b/Documentation/leds-class.txt
--- a/Documentation/leds/leds-lp5521.txt
+++ b/Documentation/leds/leds-lp5521.txt
--- a/Documentation/leds/leds-lp5523.txt
+++ b/Documentation/leds/leds-lp5523.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
--- a/Documentation/rbtree.txt
+++ b/Documentation/rbtree.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/19
+++ b/19
--- a/2
+++ b/2
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/include/asm/hardware/it8152.h
+++ b/arch/arm/include/asm/hardware/it8152.h
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
--- a/arch/arm/mach-ep93xx/include/mach/dma.h
+++ b/arch/arm/mach-ep93xx/include/mach/dma.h
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c
--- a/arch/arm/mach-kirkwood/lacie_v2-common.c
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c
--- a/arch/arm/mach-kirkwood/lacie_v2-common.h
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
--- a/arch/arm/mach-kirkwood/ts41x-setup.c
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c
--- a/arch/arm/mach-mmp/include/mach/cputype.h
+++ b/arch/arm/mach-mmp/include/mach/cputype.h
--- a/arch/arm/mach-mv78xx0/mpp.c
+++ b/arch/arm/mach-mv78xx0/mpp.c
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
--- a/arch/arm/mach-omap1/include/mach/camera.h
+++ b/arch/arm/mach-omap1/include/mach/camera.h
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
--- a/arch/arm/mach-orion5x/mpp.c
+++ b/arch/arm/mach-orion5x/mpp.c
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
--- a/arch/arm/mach-pxa/saar.c
+++ b/arch/arm/mach-pxa/saar.c
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
--- a/arch/arm/plat-orion/include/plat/pcie.h
+++ b/arch/arm/plat-orion/include/plat/pcie.h
--- a/arch/arm/plat-orion/pcie.c
+++ b/arch/arm/plat-orion/pcie.c
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
--- a/arch/parisc/hpux/sys_hpux.c
+++ b/arch/parisc/hpux/sys_hpux.c
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
--- a/arch/s390/mm/gup.c
+++ b/arch/s390/mm/gup.c
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
--- a/arch/sparc/kernel/windows.c
+++ b/arch/sparc/kernel/windows.c
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
--- a/arch/tile/kernel/sys.c
+++ b/arch/tile/kernel/sys.c
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
--- a/arch/tile/mm/hugetlbpage.c
+++ b/arch/tile/mm/hugetlbpage.c
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
--- a/arch/x86/include/asm/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
--- a/arch/x86/kernel/mmconf-fam10h_64.c
+++ b/arch/x86/kernel/mmconf-fam10h_64.c
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
--- a/block/blk-map.c
+++ b/block/blk-map.c
--- a/Show more
+++ b/Show more