| commit | b8bc83971cc20cae3c3b65c26a804f350d74960c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sun Oct 30 20:59:09 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sun Oct 30 20:59:09 2011 +0100 |
| tree | 2573e6367e1806c298344fa023bb49a16cc4d1e4 | |
| parent | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 [diff] | |
| parent | bca7ab316edd819edd0e3d59f9ccb26c6b2173f5 [diff] |
Merge branch 'pxa/devel' into next/devel2 Conflicts: arch/arm/mach-s3c2416/s3c2416.c