History

Merge branch 'rotary-encoder' into next

Bring in updates to roraty encoder driver switching it away from legacy platform data and over to generic device properties and adding support for encoders using more than 2 GPIOs.

Dmitry Torokhov committed 10 years ago

Commit 52cdce82 parents 3cd4786 7dde4e7477 files · +4626 −2631Browse files

Showing the changes to include/uapi (2 of 477 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/openvswitch.h +1 −1
include/uapi/linux/Kbuild+1−0
@@ -186,6 +186,7 @@ header-y += if_tunnel.h · 185 unmodified lines
186186 header-y += if_vlan.h
187187 header-y += if_x25.h
188188 header-y += igmp.h
189+header-y += ila.h
189190 header-y += in6.h
190191 header-y += inet_diag.h
191192 header-y += in.h
include/uapi/linux/openvswitch.h+1−1
@@ -628,7 +628,7 @@ struct ovs_action_hash { · 627 unmodified lines
628628 * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the
629629 * mask, the corresponding bit in the value is copied to the connection
630630 * tracking mark field in the connection.
631− * @OVS_CT_ATTR_LABEL: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN
631+ * @OVS_CT_ATTR_LABELS: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN
632632 * mask. For each bit set in the mask, the corresponding bit in the value is
633633 * copied to the connection tracking label field in the connection.
634634 * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t