Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver and the DSA core code. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
static const char ibmvnic_driver_name[] = "ibmvnic";
|
||||
static const char ibmvnic_driver_string[] = "IBM System i/p Virtual NIC Driver";
|
||||
|
||||
MODULE_AUTHOR("Santiago Leon <santi_leon@yahoo.com>");
|
||||
MODULE_AUTHOR("Santiago Leon");
|
||||
MODULE_DESCRIPTION("IBM System i/p Virtual NIC Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(IBMVNIC_DRIVER_VERSION);
|
||||
|
Reference in New Issue
Block a user