diff options
| author | Russell King | 2015-04-23 21:05:16 +0000 |
|---|---|---|
| committer | Russell King | 2015-04-23 21:05:16 +0000 |
| commit | 6b7acae74fc2ffe6cfd7592e95ca933cadb31219 (patch) | |
| tree | a3a1aa0aec02ffbf5d4b323869a81610f93094a4 | |
| parent | 4b2f8838479eb2abe042e094f7d2cced6d5ea772 (diff) | |
| parent | 0a9024e80e85552b21076542355a4f4a7c0b9472 (diff) | |
| parent | f80f6531b47c538b69769ada5e9fbacad085b34d (diff) | |
Merge branches 'misc' and 'vdso' into for-next