diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-02 18:37:57 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-02 18:37:57 -0500 |
| commit | cc85a6e2d097506dba2c5b8044884a3d22cc4a6e (patch) | |
| tree | cf201f55a11004d2cde7cbf6332fe10eb8d3e47e | |
| parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) | |
| parent | 0e96a0c83f0842d5cfd83b0a896bc82ff61f9849 (diff) | |
Merge tag 'linux-cpupower-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Pull cpupower update for v4.16 from Shuah Khan:
"This update consists of a patch to remove FSF address."
* tag 'linux-cpupower-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
cpupower: Remove FSF address
| -rw-r--r-- | tools/power/cpupower/lib/cpufreq.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h index 3b005c39f068..60beaf5ed2ea 100644 --- a/tools/power/cpupower/lib/cpufreq.h +++ b/tools/power/cpupower/lib/cpufreq.h | |||
| @@ -11,10 +11,6 @@ | |||
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 | * GNU General Public License for more details. | 13 | * GNU General Public License for more details. |
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License | ||
| 16 | * along with this program; if not, write to the Free Software | ||
| 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 18 | */ | 14 | */ |
| 19 | 15 | ||
| 20 | #ifndef __CPUPOWER_CPUFREQ_H__ | 16 | #ifndef __CPUPOWER_CPUFREQ_H__ |