| commit | 6ad30ce046aefbdc3848232c665a728860d7bb68 | [log] [tgz] |
|---|---|---|
| author | Linus Walleij <linus.walleij@linaro.org> | Thu Aug 29 09:46:30 2013 +0200 |
| committer | Linus Walleij <linus.walleij@linaro.org> | Thu Aug 29 09:46:30 2013 +0200 |
| tree | 34af8fc78b28281fcfe531a26401b440c078038e | |
| parent | 0351c287952483dafa904f84496631198465fbf4 [diff] | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 [diff] |
Merge tag 'v3.11-rc7' into devel Merged in this to avoid conflicts with the big locking fixes from upstream. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Conflicts: drivers/pinctrl/pinctrl-sunxi.c