diff options
author | 2012-05-11 09:04:22 +0200 | |
---|---|---|
committer | 2012-05-11 09:04:22 +0200 | |
commit | b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1 (patch) | |
tree | ba257ac34b1ce57a29ec0d603b9e7d6400d6bea0 /include/linux/v4l2-subdev.h | |
parent | ARM: ux500: Add support for MSP I2S-devices (diff) | |
parent | pinctrl: show pin name for pingroups in sysfs (diff) | |
download | wireguard-linux-b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1.tar.xz wireguard-linux-b9e3b72d4a8b3a6c85474455f464e12b4ef1cfc1.zip |
Merge tag 'pinctrl-mergebase-20120418' into HEAD
Conflicts:
drivers/pinctrl/core.c
Diffstat (limited to 'include/linux/v4l2-subdev.h')
0 files changed, 0 insertions, 0 deletions