git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0351c28
d8dfad3
)
Merge tag 'v3.11-rc7' into devel
author
Linus Walleij
<linus.walleij@linaro.org>
Thu, 29 Aug 2013 07:46:30 +0000
(09:46 +0200)
committer
Linus Walleij
<linus.walleij@linaro.org>
Thu, 29 Aug 2013 07:46:30 +0000
(09:46 +0200)
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
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff