git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@elte.hu>
	Sat, 28 Mar 2009 03:21:18 +0000 (04:21 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 28 Mar 2009 03:26:01 +0000 (04:26 +0100)
commit	a26a016420015b94a91336820774745df76209c1
tree	9803f361556d10708313e980428e63a18162e667	tree \| snapshot
parent	72929949a607f50592cc984e93303973d04b1f25	commit \| diff
parent	942961b7e462994c702308f5558add1f061ff27d	commit \| diff

Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

drivers/gpu/drm/drm_info.c

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

arch/sparc/kernel/time_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_info.c	\|	diff2 \|	blob \| history
drivers/net/wireless/arlan-main.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/sparc/kernel/time_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_info.c	\|	diff2 \|	blob \| history
drivers/net/wireless/arlan-main.c	diff1 \|	diff2 \|	blob \| history