diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-23 11:43:15 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-23 11:43:15 -0800 |
| commit | c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (patch) | |
| tree | 1a52393126be95454c49f34be63f1fe3a6a9a15f /arch/arm/mach-s3c2410/pm-h1940.S | |
| parent | 04aa67dec63b61c1a8b9b6d001262250f1a92130 (diff) | |
| parent | adc5430b473db2842a96fcce1ffbd43049757d3b (diff) | |
| parent | e49c4d27ab5ffd0d8707685af9ca2866a95660e8 (diff) | |
| parent | 7715db5aeca09d853be4f2eb0bc688a970220621 (diff) | |
| parent | c497dd5594ed3ef97bc563b07e8c050618f745a3 (diff) | |
Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand' into omap-for-linus