raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-09 03:20:05 +00:00
Code Issues Projects Releases Wiki Activity
Files
be055b2f89b5842f41363b5655a33dffb51a8294
linux/arch/arm/mach-imx/platsmp.c
Arnd Bergmann 4a9226a3d1 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>
2013-02-19 17:22:34 +01:00

2.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink