| commit | f19693a17c6705e197eb24d4618060eaac1b535c | [log] [tgz] |
|---|---|---|
| author | Sascha Hauer <s.hauer@pengutronix.de> | Fri Feb 11 08:32:18 2011 +0100 |
| committer | Sascha Hauer <s.hauer@pengutronix.de> | Fri Feb 11 08:33:14 2011 +0100 |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd | |
| parent | 23b120cdfae4f5c29da69de750d545bad719ead4 [diff] | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d [diff] |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>