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)
Conflicts:
drivers/gpio/gpio-em.c


Trivial merge