diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-28 21:38:48 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-28 21:38:48 +0000 |
| commit | f5137a45c20713f06535b7d952b72b673c27488f (patch) | |
| tree | 75355c4aa6a14d1790406c02ef04231d6d11e3f3 | |
| parent | 54c0a4b46150db1571d955d598cd342c9f1d9657 (diff) | |
| parent | d326b65c57d64208646206d0bfd4e2d19d6df38c (diff) | |
| parent | c5ca95b507c8a2a69e49eeda539b41bd76922d7f (diff) | |
Merge branches 'fixes' and 'misc' into for-linus