git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 128c6d2 bb4d5c0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 8 Jan 2014 03:00:20 +0000 (14:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 8 Jan 2014 03:00:20 +0000 (14:00 +1100)
commit	abada6b82c9438c806edc71245c3644c98865706
tree	7482ddd350f1f59aeb873e0d2f23d5ef93642ba5	tree \| snapshot
parent	128c6d290240414c26b6ed2e8d175b30fc8156e7	commit \| diff
parent	bb4d5c0664ffa18d5b4a6d68aead3b0d4a854ee1	commit \| diff

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
drivers/acpi/acpi_extlog.c
drivers/acpi/processor_idle.c

18 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/acpi/acpi_extlog.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/acpi_pad.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/apei/einj.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/thermal/intel_powerclamp.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules