commit | 1feafd64cbc31b75b7b08ab3ca0305311c3f6246 | [log] [tgz] |
---|---|---|
author | Russell King <rmk+kernel@armlinux.org.uk> | Mon Sep 12 11:19:04 2016 +0100 |
committer | Russell King <rmk+kernel@armlinux.org.uk> | Mon Sep 12 11:19:04 2016 +0100 |
tree | 93febf132b9beca529b9a0df0de3eae084d6b9e6 | |
parent | 817ed5748e40bbc5b5f2aa0c3094c4a7adfb8881 [diff] | |
parent | 87d5dd62c07f90ed2b0d6718f5c666f69e7d39b0 [diff] |
Merge branches 'fixes-pcmcia' and 'fixes-sa1111' into fixes