review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cf9972a 0af48f4)

author	H. Peter Anvin <hpa@zytor.com>
	Sat, 23 May 2009 23:42:19 +0000 (16:42 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Sat, 23 May 2009 23:42:19 +0000 (16:42 -0700)
commit	ee0736627d3347be0be2769fa7b26431f9726c9d
tree	203e2204daaec4cf005463fdf2c7bf380d6eef36	tree \| snapshot
parent	cf9972a921470b0a2da7906104bcd540b20e33bf	commit \| diff
parent	0af48f42df15b97080b450d24219dd95db7b929a	commit \| diff

Merge branch 'x86/urgent' into x86/setup

Resolved conflicts:
arch/x86/boot/memory.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

arch/x86/boot/memory.c

Domain: System / Kernel;