diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 07:57:50 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 07:57:50 +0300 |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /drivers/infiniband/hw/usnic/usnic_abi.h | |
| parent | 53e597b1d194910bef53ed0632da329fef497904 (diff) | |
| parent | a5be88f63eaff1c03774aecd7388015cb87f6b2c (diff) | |
| download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz | |
Merge branch 'topic/hw-constraint-single' into for-next
Diffstat (limited to 'drivers/infiniband/hw/usnic/usnic_abi.h')
| -rw-r--r-- | drivers/infiniband/hw/usnic/usnic_abi.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_abi.h b/drivers/infiniband/hw/usnic/usnic_abi.h index 04a66229584e..7fe9502ce8d3 100644 --- a/drivers/infiniband/hw/usnic/usnic_abi.h +++ b/drivers/infiniband/hw/usnic/usnic_abi.h @@ -1,9 +1,24 @@ /* * Copyright (c) 2013, Cisco Systems, Inc. All rights reserved. * - * This program is free software; you may redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |