diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-12-04 14:48:17 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-04 14:48:17 +0100 |
| commit | 33e0aae11e4854c792e9871f94da6d28bf2e2bb8 (patch) | |
| tree | d75422fcd621bb1a4ec019f7ab625e3bc99ffaff /block/ioctl.c | |
| parent | 9fb1f39eb2d6707d265087ee186376e24995f55a (diff) | |
| parent | eb7cce1ea96b6399672abce787598f6e7a4352c3 (diff) | |
| download | linux-33e0aae11e4854c792e9871f94da6d28bf2e2bb8.tar.bz2 | |
Merge branch 'mark-irqs' into devel
Conflicts:
drivers/gpio/gpio-em.c
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions