]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita4e3f933e0f388a30732d55fcdbb92e6caeb9a1a
treed75422fcd621bb1a4ec019f7ab625e3bc99ffaff
parent862c52607fd8c9433bb78b12ad1269b2a7a52d67
parentafc698af00d5231417f2e725fff009494fab0d4a
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