| commit | a3849a4c038a21075a0bc7eaf37f65a93976d10c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Oct 08 21:47:06 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Oct 08 21:47:06 2011 +0200 |
| tree | 77e1148cdd719856dcf1692f8d9167691347d17b | |
| parent | 71f2c153755442c05d15cd025484f676a5f3541f [diff] | |
| parent | 1bf6d2c1bb23533af6930581cc39b74685bc29de [diff] |
Merge branch 'stericsson/fixes' into next/cleanup Conflicts: arch/arm/mach-ux500/cpu.c