git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
23b120c
100b33c
)
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
author
Sascha Hauer
<s.hauer@pengutronix.de>
Fri, 11 Feb 2011 07:32:18 +0000
(08:32 +0100)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Fri, 11 Feb 2011 07:33:14 +0000
(08:33 +0100)
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff