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: e0d6ad2 66fa28e)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 07:09:38 +0000 (18:09 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 07:09:38 +0000 (18:09 +1100)
commit	8e047daf499a2ee81dda1598fc8a1ca5993030a7
tree	391bf77e982e1578943e6bf3ea8a92faebd212f2	tree \| snapshot
parent	e0d6ad20367d23e615366fa24dd8f037648fde6c	commit \| diff
parent	66fa28e2bb4a96a6d1fb6ee8271a2186695357ec	commit \| diff

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

Conflicts:
drivers/acpi/acpi_extlog.c

12 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	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/apei/einj.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules