diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 23:33:50 +0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 23:33:50 +0400 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /include/linux/extcon | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) | |
| download | linux-dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4.tar.xz | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'include/linux/extcon')
| -rw-r--r-- | include/linux/extcon/extcon-gpio.h (renamed from include/linux/extcon/extcon_gpio.h) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/include/linux/extcon/extcon_gpio.h b/include/linux/extcon/extcon-gpio.h index 2d8307f7d67d..2d8307f7d67d 100644 --- a/include/linux/extcon/extcon_gpio.h +++ b/include/linux/extcon/extcon-gpio.h |