Merge tag 'v3.11-rc7' into devel (6ad30ce0) · Commits · github.com / kvm-riscv / linux

Commit 6ad30ce0 authored Aug 29, 2013 by

Linus Walleij

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

parents 0351c287 d8dfad38

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment