git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d37694
a0e86bd
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author
Paul Mundt
<lethal@linux-sh.org>
Mon, 9 Jan 2012 02:12:55 +0000
(11:12 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Mon, 9 Jan 2012 02:12:55 +0000
(11:12 +0900)
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff