diff options
| author | Linus Torvalds | 2014-06-26 06:38:45 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-26 06:38:45 +0200 |
| commit | 2a80ff867f35b39b27564eb006103966f90f10ea (patch) | |
| tree | 3e0a596646f0e828fdcf00b7f0789b5eb90dd02c /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | hwmon: (gpio-fan) Change name used in hwmon_device_register_with_groups (diff) | |
| download | kernel-qcow2-linux-2a80ff867f35b39b27564eb006103966f90f10ea.tar.gz kernel-qcow2-linux-2a80ff867f35b39b27564eb006103966f90f10ea.tar.xz kernel-qcow2-linux-2a80ff867f35b39b27564eb006103966f90f10ea.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Various minor fixes"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (gpio-fan) Change name used in hwmon_device_register_with_groups
hwmon: (emc1403) Fix missing 'select REGMAP_I2C' in Kconfig
hwmon: (ntc_thermistor) Use the manufacturer name properly
devicetree: bindings: Document murata vendor prefix
hwmon: (w83l786ng) Report correct minimum fan speed
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 4d7f3758d1b4..46a311e728a8 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -83,6 +83,7 @@ mosaixtech Mosaix Technologies, Inc. moxa Moxa mpl MPL AG mundoreader Mundo Reader S.L. +murata Murata Manufacturing Co., Ltd. mxicy Macronix International Co., Ltd. national National Semiconductor neonode Neonode Inc. |