diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 17:22:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 17:22:34 +0100 |
| commit | 4a9226a3d192c38493106dcaf5f47f291ede9ed5 (patch) | |
| tree | f5791e3147b713e02b69c528644a8a2d41b3ea7f /arch/arm/mach-kirkwood/board-nsa310.c | |
| parent | 7839c281edd9f4744be58ff0b29aabc64aabde31 (diff) | |
| parent | e5f9dec8ff5ff3f6254412abed1f68d758f6616b (diff) | |
Merge branch 'imx/cpuidle' into late/dt
This resolves one non-obvious merge conflict between the imx cpuidle
patches and the imx DT changes for 3.9.
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-nsa310.c')
0 files changed, 0 insertions, 0 deletions