diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 11:05:44 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 11:05:44 -0400 |
| commit | 0606263f24f3d64960de742c55894190b5df903b (patch) | |
| tree | 673894f227c1a761f601ad7bdc1ceef003bb85cb /scripts/checkpatch.pl | |
| parent | a72255983f12f31f0c8d8275fb1a781546cfacb7 (diff) | |
| parent | d4c5725d57323e2348940fcc6416072671a9b432 (diff) | |
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 4904ced676d4..24a08363995a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
| @@ -313,7 +313,6 @@ our $Sparse = qr{ | |||
| 313 | __kernel| | 313 | __kernel| |
| 314 | __force| | 314 | __force| |
| 315 | __iomem| | 315 | __iomem| |
| 316 | __pmem| | ||
| 317 | __must_check| | 316 | __must_check| |
| 318 | __init_refok| | 317 | __init_refok| |
| 319 | __kprobes| | 318 | __kprobes| |