| commit | 82268da1b130f763d22d04f7d016bbf6fc8815c2 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Mar 28 04:21:18 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Mar 28 04:26:01 2009 +0100 |
| tree | 9803f361556d10708313e980428e63a18162e667 | |
| parent | 6e15cf04860074ad032e88c306bea656bbdd0f22 [diff] | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a [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>