git.karo-electronics.de Git - linux-beck.git/commit

]> git.karo-electronics.de Git - linux-beck.git/commit

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)
commit	6ad30ce046aefbdc3848232c665a728860d7bb68
tree	34af8fc78b28281fcfe531a26401b440c078038e	tree \| snapshot
parent	0351c287952483dafa904f84496631198465fbf4	commit \| diff
parent	d8dfad3876e4386666b759da3c833d62fb8b2267	commit \| 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

Beck SC1x5 Kernel

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/atlas6.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/core.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-single.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/pinctrl-sunxi.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/sh-pfc/pfc-sh73a0.c	diff1 \|	diff2 \|	blob \| history
drivers/pinctrl/sirf/pinctrl-atlas6.c	diff1 \|	diff2 \|	blob \| history