diff options
author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /drivers/i2c/busses/i2c-au1550.c | |
parent | nfsd: convert nfs4_file searches to use RCU (diff) | |
parent | SUNRPC: Fix locking around callback channel reply receive (diff) | |
download | linux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'drivers/i2c/busses/i2c-au1550.c')
-rw-r--r-- | drivers/i2c/busses/i2c-au1550.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 8762458ca7da..6f8c0756e350 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c @@ -21,10 +21,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <linux/delay.h> |