git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
607b067
6e1588c
)
Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async...
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Mon, 16 Mar 2009 22:28:04 +0000
(22:28 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 16 Mar 2009 22:28:04 +0000
(22:28 +0000)
Conflicts:
drivers/video/mx3fb.c
Trivial merge