| commit | b41fb43911b4cb864812adec88d028cc6219f23e | [log] [tgz] |
|---|---|---|
| author | Linus Walleij <linus.walleij@linaro.org> | Sat Oct 19 23:24:03 2013 +0200 |
| committer | Linus Walleij <linus.walleij@linaro.org> | Sat Oct 19 23:24:03 2013 +0200 |
| tree | f383de554dc3640ec3081ad41fa34f7cab68de82 | |
| parent | 0963d59bc0bbed48b06733950f5eb167e9b9a8fa [diff] | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 [diff] |
Merge tag 'v3.12-rc6' into devel Linux 3.12-rc6 Conflicts: drivers/gpio/gpio-lynxpoint.c