| commit | c848791f0336914a3081ea3fe029cf177d81de81 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Apr 14 22:28:25 2015 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Apr 14 22:28:25 2015 +0100 |
| tree | 41e6c0003218b5a2075a3f09f781bf345029096e | |
| parent | 79403cda37204b06b9f96351a35251ff7d88de4b [diff] | |
| parent | e5b61deb3af465f11db7e5e11944ba00a33ece1f [diff] | |
| parent | 6c5c2a01fcfdb70f2e95e30e96ccf53b88e81023 [diff] |
Merge branches 'misc', 'vdso' and 'fixes' into for-next Conflicts: arch/arm/mm/proc-macros.S