Merge branch 'mark-irqs' into devel
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 4 Dec 2013 13:48:17 +0000 (14:48 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 4 Dec 2013 13:48:17 +0000 (14:48 +0100)
commit33e0aae11e4854c792e9871f94da6d28bf2e2bb8
treed75422fcd621bb1a4ec019f7ab625e3bc99ffaff
parent9fb1f39eb2d6707d265087ee186376e24995f55a
parenteb7cce1ea96b6399672abce787598f6e7a4352c3
Merge branch 'mark-irqs' into devel

Conflicts:
drivers/gpio/gpio-em.c
drivers/gpio/gpio-adnp.c
drivers/gpio/gpio-em.c
drivers/gpio/gpio-intel-mid.c
drivers/gpio/gpio-lynxpoint.c