projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b69791
1bd51cd
)
Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
author
Olof Johansson
<olof@lixom.net>
Fri, 6 Jan 2012 20:44:05 +0000
(12:44 -0800)
committer
Olof Johansson
<olof@lixom.net>
Fri, 6 Jan 2012 20:44:05 +0000
(12:44 -0800)
1
2
arch/arm/mach-imx/head-v7.S
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-imx/head-v7.S
Simple merge