git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8055039 6ec22f9)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 7 Dec 2009 12:14:12 +0000 (13:14 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 7 Dec 2009 12:14:18 +0000 (13:14 +0100)
commit	f3d607c6b39bd9cb5000e03e2c0dc2afe1241374
tree	885b5e0b5bb3d87efc4bfbde69feff2ece32ecac	tree \| snapshot
parent	8055039c2a2454c7159dcbde3161943b757a6e0e	commit \| diff
parent	6ec22f9b037fc0c2e00ddb7023fad279c365324d	commit \| diff

Merge branch 'linus' into x86/urgent

Merge reason: we want to queue up a dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile_32.cpu	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/reboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/kmmio.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree