diff options
| author | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
| commit | c646b0f4fdad4cc9dabdcbe40b5a893d173e2850 (patch) | |
| tree | 246e0d7bc48137f2d176ad126cebd275a60b6833 /arch/powerpc/include/asm/gpio.h | |
| parent | 4ce237b369eb9513c090d3c97e0c06c5a33f0cf7 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge tag 'v3.17' into toradex_vf_3.17-next
Linux 3.17
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'arch/powerpc/include/asm/gpio.h')
0 files changed, 0 insertions, 0 deletions