diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-01-21 15:38:10 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-01-21 15:38:10 +0000 |
| commit | 3a175cdf439275c3da347b6b42c4e9b652a12904 (patch) | |
| tree | bfa8fa380c846e75cb61c2fa502906b721d82dd7 | |
| parent | 091f02483df7b56615b524491f404e574c5e0668 (diff) | |
| parent | ff5fdafc9e9702846480e0cea55ba861f72140a2 (diff) | |
| parent | be2bedb08fe889f7621c1f3f400900ad2394f65b (diff) | |
| parent | f85fac0efa9087a9311f3d2bdc227ded3ac95db5 (diff) | |
Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next