git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e15cf0
5d80f8e
)
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
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)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff