diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-28 12:02:44 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-28 12:02:44 -0700 |
commit | 4fac6f0e654aeb8ffc9f06285933c7268747bc0d (patch) | |
tree | 9533c5cacf05f41ffea4f5acd691953817268eed /arch/arm/plat-samsung/Makefile | |
parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
parent | 97916777d6904e24b86eac77da58ef7cb09d539d (diff) | |
download | blackbird-op-linux-4fac6f0e654aeb8ffc9f06285933c7268747bc0d.tar.gz blackbird-op-linux-4fac6f0e654aeb8ffc9f06285933c7268747bc0d.zip |
Merge branch 'samsung/pinctrl-exynos' into late/dt
* samsung/pinctrl-exynos:
ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250
pinctrl: exynos: add exynos5250 SoC specific data
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
0 files changed, 0 insertions, 0 deletions