diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:27:56 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:27:56 +0000 |
| commit | 038485ea9b66858c17f82e5393004532825106a7 (patch) | |
| tree | e411be1686e4ed73c4f74f0388410231d26e5c76 /fs/nfs/dir.c | |
| parent | 5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72 (diff) | |
| parent | 8b69791215857e3e885d27b3945759ace820794a (diff) | |
Merge branch 'imx6/pm' into next/pm
* 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
Diffstat (limited to 'fs/nfs/dir.c')
0 files changed, 0 insertions, 0 deletions