git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca9c20c
3c0eee3
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Paul Mundt
<lethal@linux-sh.org>
Thu, 6 Jan 2011 09:27:34 +0000
(18:27 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Thu, 6 Jan 2011 09:27:34 +0000
(18:27 +0900)
Conflicts:
drivers/video/sh_mobile_lcdcfb.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff