| commit | 7109561524dc57b95fd3f9b61547268b9b6db8ed | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Aug 05 10:27:13 2014 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Aug 05 10:27:13 2014 +0100 |
| tree | df08f565b2c616b7e68fe35cd428a8c5ba3bfcb1 | |
| parent | 6bf755db4d5e7ccea61fb17727a183b9bd8945b1 [diff] | |
| parent | 3bb70de692f70861f5c5729cd2b870d0104a7cc9 [diff] |
Merge branches 'fixes' and 'misc' into for-next Conflicts: arch/arm/kernel/iwmmxt.S arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c