3 Commits

Author	SHA1	Message	Date
Russell King	404a02cbd2	Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h	2011-01-06 22:33:32 +00:00
Fabio Estevam	2c1f4672f0	watchdog: imx: use clk_get to acquire the watchdog clock ... Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>	2010-12-14 09:54:19 +01:00
Uwe Kleine-König	e48ab1c16f	ARM: imx: move mx25 support to mach-imx ... Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>	2010-11-19 21:53:49 +01:00