diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
| commit | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (patch) | |
| tree | b0f7a9bbf7b64727a0f1b35f70ead1a4d2809736 /d10.patch | |
| parent | 7d9e0d94f09501482a336a7a2e692c159ec4c9a9 (diff) | |
| download | patches-40a2bc5b5c03c7219f40be1f5be51089a156b974.tar.gz | |
refresh and move some patches out of the main queue
Diffstat (limited to 'd10.patch')
| -rw-r--r-- | d10.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/d10.patch b/d10.patch index 08b9f0221ce6fc..0d68a7e2688f25 100644 --- a/d10.patch +++ b/d10.patch @@ -169,7 +169,7 @@ #endif /* --------------------------------------------------------------------- */ -@@ -8537,14 +8505,13 @@ static ssize_t fan_fan2_input_show(struc +@@ -8606,14 +8574,13 @@ static ssize_t fan_fan2_input_show(struc static DEVICE_ATTR(fan2_input, S_IRUGO, fan_fan2_input_show, NULL); /* sysfs fan fan_watchdog (hwmon driver) ------------------------------- */ @@ -187,7 +187,7 @@ { unsigned long t; -@@ -8561,9 +8528,7 @@ static ssize_t fan_fan_watchdog_store(st +@@ -8630,9 +8597,7 @@ static ssize_t fan_fan_watchdog_store(st return count; } |