tree d75422fcd621bb1a4ec019f7ab625e3bc99ffaff
parent 9fb1f39eb2d6707d265087ee186376e24995f55a
parent eb7cce1ea96b6399672abce787598f6e7a4352c3
author Linus Walleij <linus.walleij@linaro.org> 1386164897 +0100
committer Linus Walleij <linus.walleij@linaro.org> 1386164897 +0100

Merge branch 'mark-irqs' into devel

Conflicts:
	drivers/gpio/gpio-em.c