projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f09e41
3c0eee3
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...
author
Paul Mundt
<lethal@linux-sh.org>
Thu, 6 Jan 2011 09:24:07 +0000
(18:24 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Thu, 6 Jan 2011 09:24:07 +0000
(18:24 +0900)
Conflicts:
arch/sh/kernel/cpu/sh2a/clock-sh7201.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff