| commit | 33e0aae11e4854c792e9871f94da6d28bf2e2bb8 | [log] [tgz] |
|---|---|---|
| author | Linus Walleij <linus.walleij@linaro.org> | Wed Dec 04 14:48:17 2013 +0100 |
| committer | Linus Walleij <linus.walleij@linaro.org> | Wed Dec 04 14:48:17 2013 +0100 |
| tree | d75422fcd621bb1a4ec019f7ab625e3bc99ffaff | |
| parent | 9fb1f39eb2d6707d265087ee186376e24995f55a [diff] | |
| parent | eb7cce1ea96b6399672abce787598f6e7a4352c3 [diff] |
Merge branch 'mark-irqs' into devel Conflicts: drivers/gpio/gpio-em.c