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: 24a30c8 4f0c129)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 29 Jul 2011 03:19:07 +0000 (13:19 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 29 Jul 2011 03:19:07 +0000 (13:19 +1000)
commit	32ad8103f9cb3a4f78c1fb349d9c19d97c4237e0
tree	15f2c9b0f1403289b5820d8d5a06278f1ed76359	tree \| snapshot
parent	24a30c801925e405595df54413c6f01c961bcdd4	commit \| diff
parent	4f0c129e0629a1c837c7fcdbd53a65afe6bbd60e	commit \| diff

Merge remote-tracking branch 'acpi/test'

Conflicts:
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile

19 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/alpha/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/m68k/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sparc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/acpi/apei/erst.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/battery.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sbs.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/video.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/acpi-cpufreq.c	diff1 \|	diff2 \|	blob \| history
include/linux/bitmap.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history
lib/bitmap.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules