]> 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)
commit610f86369c492581ea4c43827518ce43d7c15594
treed75422fcd621bb1a4ec019f7ab625e3bc99ffaff
parent0a30659fbae8830292a6fecbe1e75aece4fc7c22
parentdb62c054f2a17337eb92d166c8484f8502043323
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