| commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 | [log] [tgz] |
|---|---|---|
| author | Sascha Hauer <s.hauer@pengutronix.de> | Mon Dec 06 09:36:17 2010 +0100 |
| committer | Sascha Hauer <s.hauer@pengutronix.de> | Mon Dec 06 09:36:17 2010 +0100 |
| tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd | |
| parent | 96886c4361f1ae3f6c775d7c9295e2d557101d0f [diff] | |
| parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 [diff] |
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>