diff options
| author | David S. Miller | 2016-10-03 03:17:07 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-10-03 04:20:41 +0200 |
| commit | b50afd203a5ef1998c18d6519ad2b2c546d6af22 (patch) | |
| tree | 608e6845e78a4ffe623c7cdf6581e29e2d9be0a9 /Documentation | |
| parent | net: Use ns_capable_noaudit() when determining net sysctl permissions (diff) | |
| parent | Linux 4.8 (diff) | |
| download | kernel-qcow2-linux-b50afd203a5ef1998c18d6519ad2b2c546d6af22.tar.gz kernel-qcow2-linux-b50afd203a5ef1998c18d6519ad2b2c546d6af22.tar.xz kernel-qcow2-linux-b50afd203a5ef1998c18d6519ad2b2c546d6af22.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes. Nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt b/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt index 1112e0d794e1..820fee4b77b6 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt @@ -13,6 +13,7 @@ Required properties: - touchscreen-size-y : See touchscreen.txt Optional properties: +- firmware-name : File basename (string) for board specific firmware - touchscreen-inverted-x : See touchscreen.txt - touchscreen-inverted-y : See touchscreen.txt - touchscreen-swapped-x-y : See touchscreen.txt |