projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d3cb0f
8b69791
)
Merge branch 'imx6/pm' into next/pm
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 3 Jan 2012 20:27:56 +0000
(20:27 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 3 Jan 2012 20:27:56 +0000
(20:27 +0000)
* imx6/pm:
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
ARM: imx6q: build pm code only when CONFIG_PM selected
ARM: mx5: use generic irq chip pm interface for pm functions on
1
2
arch/arm/plat-mxc/include/mach/common.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/plat-mxc/include/mach/common.h
Simple merge