diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 16:37:02 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 16:37:02 +0200 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /drivers/net/enic/vnic_rss.h | |
| parent | arch/tile: check kmalloc() result (diff) | |
| parent | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-ab11b487402f97975f3ac1eeea09c82f4431481e.tar.xz linux-ab11b487402f97975f3ac1eeea09c82f4431481e.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/enic/vnic_rss.h')
| -rw-r--r-- | drivers/net/enic/vnic_rss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/enic/vnic_rss.h index 5fbb3c923bcd..f62d18719629 100644 --- a/drivers/net/enic/vnic_rss.h +++ b/drivers/net/enic/vnic_rss.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Cisco Systems, Inc. All rights reserved. + * Copyright 2008-2010 Cisco Systems, Inc. All rights reserved. * Copyright 2007 Nuova Systems, Inc. All rights reserved. * * This program is free software; you may redistribute it and/or modify |