Sascha Hauer 0e44e05958 Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-06 09:36:17 +01:00
..
2010-10-29 04:16:28 -04:00
2010-10-22 10:22:07 -07:00
2010-09-03 17:33:40 -07:00