diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2013-10-19 23:24:03 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-19 23:24:03 +0200 |
| commit | b41fb43911b4cb864812adec88d028cc6219f23e (patch) | |
| tree | f383de554dc3640ec3081ad41fa34f7cab68de82 /include/linux/gpio.h | |
| parent | Fixup "MAINTAINERS: GPIO-INTEL-MID: add maintainer" (diff) | |
| parent | Linux 3.12-rc6 (diff) | |
| download | linux-dev-b41fb43911b4cb864812adec88d028cc6219f23e.tar.xz linux-dev-b41fb43911b4cb864812adec88d028cc6219f23e.zip | |
Merge tag 'v3.12-rc6' into devel
Linux 3.12-rc6
Conflicts:
drivers/gpio/gpio-lynxpoint.c
Diffstat (limited to 'include/linux/gpio.h')
0 files changed, 0 insertions, 0 deletions