projects / profile / ivi / kernel-adaptation-intel-automotive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e15cf0 5d80f8e)
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 03:21:18 +0000 (04:21 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Mar 2009 03:26:01 +0000 (04:26 +0100)
commit82268da1b130f763d22d04f7d016bbf6fc8815c2
tree9803f361556d10708313e980428e63a18162e667tree | snapshot
parent6e15cf04860074ad032e88c306bea656bbdd0f22commit | diff
parent5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4acommit | 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
Domain: System / Uncategorized;