]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:43:53 +0000 (14:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:44:00 +0000 (14:44 +1100)
commite2c0f16dd4b6c8fb35308c08b95fc29d52f1cfd1
tree5474a85624cc67c6b6343c87c0779e329056f34a
parent3b8e214c284bfb8a335ff8b228d76b2b409ef0b2
parent0d3fd2665089235726e7ee4ac29e982fe3f98447
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/powerpc/configs/pasemi_defconfig
arch/s390/Kconfig
kernel/timeconst.pl
56 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/ia64/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/powerpc/configs/corenet64_smp_defconfig
arch/powerpc/configs/pasemi_defconfig
arch/powerpc/include/asm/perf_event_server.h
arch/powerpc/include/asm/ppc_asm.h
arch/powerpc/kernel/entry_64.S
arch/powerpc/perf/core-book3s.c
arch/powerpc/platforms/pseries/setup.c
arch/s390/Kconfig
arch/s390/kernel/vtime.c
arch/x86/Kconfig
arch/x86/Makefile
arch/x86/include/asm/pci.h
arch/x86/include/asm/processor.h
arch/x86/include/uapi/asm/msr-index.h
arch/x86/kernel/apm_32.c
arch/x86/kernel/cpu/amd.c
block/blk-exec.c
drivers/ata/ahci.c
drivers/edac/amd64_edac.c
drivers/iommu/amd_iommu.c
drivers/iommu/dmar.c
drivers/iommu/intel-iommu.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/spi/spi.c
drivers/thermal/intel_powerclamp.c
drivers/tty/sysrq.c
fs/binfmt_elf.c
include/linux/mm.h
include/linux/pci.h
include/linux/sched.h
init/Kconfig
kernel/printk.c
kernel/sched/core.c
kernel/softirq.c
kernel/sysctl.c
kernel/time/tick-sched.c
kernel/trace/Kconfig
kernel/trace/blktrace.c
kernel/trace/ring_buffer.c
lib/Kconfig.debug
mm/bootmem.c
mm/page-writeback.c
mm/page_alloc.c
tools/Makefile
tools/perf/perf.h