diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 06:52:14 +0200 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 06:52:14 +0200 |
commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
tree | 89b840115ccd753216ba0b26e587e52699b99310 /fs/nfsd/Makefile | |
parent | intel powerclamp: support Knights Landing (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
download | linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip |
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'fs/nfsd/Makefile')
0 files changed, 0 insertions, 0 deletions