git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b3edd9
e174d13
)
Merge branch 'master' into sh/cachetlb
author
Paul Mundt
<lethal@linux-sh.org>
Wed, 19 Aug 2009 00:12:00 +0000
(09:12 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Wed, 19 Aug 2009 00:12:00 +0000
(09:12 +0900)
Conflicts:
arch/sh/kernel/Makefile_64
Trivial merge