git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22b737f
c5974b8
)
Merge branch 'master' into percpu
author
Tejun Heo
<tj@kernel.org>
Tue, 5 Jan 2010 00:17:33 +0000
(09:17 +0900)
committer
Tejun Heo
<tj@kernel.org>
Tue, 5 Jan 2010 00:17:33 +0000
(09:17 +0900)
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff