diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2022-09-24 18:14:12 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2022-09-24 18:14:12 -0700 |
| commit | b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 (patch) | |
| tree | 77795fbece4fc61a659ed97c70d798ca81f35bb8 /include/linux/usb/ulpi.h | |
| parent | 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3 (diff) | |
| parent | 67feaba413ec68daf4124e9870878899b4ed9a0e (diff) | |
Merge branch 'for-6.0/dax' into libnvdimm-fixes
Pick up another "Soft Reservation" fix for v6.0-final on top of some
straggling nvdimm fixes that missed v5.19.
Diffstat (limited to 'include/linux/usb/ulpi.h')
| -rw-r--r-- | include/linux/usb/ulpi.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h index 36c2982780ad..5050f502c1ed 100644 --- a/include/linux/usb/ulpi.h +++ b/include/linux/usb/ulpi.h @@ -3,10 +3,6 @@ * ulpi.h -- ULPI defines and function prorotypes * * Copyright (C) 2010 Nokia Corporation - * - * This software is distributed under the terms of the GNU General - * Public License ("GPL") as published by the Free Software Foundation, - * version 2 of that License. */ #ifndef __LINUX_USB_ULPI_H |