commit | 6a7b3e970426f4bc2a8d52f81a4fda6595a9f052 | [log] [tgz] |
---|---|---|
author | Linus Walleij <linus.walleij@linaro.org> | Wed Apr 03 22:18:36 2013 +0200 |
committer | Linus Walleij <linus.walleij@linaro.org> | Wed Apr 03 22:18:36 2013 +0200 |
tree | 055765564c839e456fbe4c65c8cd2c4b00d731b7 | |
parent | 661462f4c6d3c9ae0bac193c65936ebfac4c95b4 [diff] | |
parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 [diff] |
Merge tag 'v3.9-rc5' into devel Linux 3.9-rc5 Conflicts: drivers/pinctrl/pinconf.c