Merge branch 'sfc-3.13' into master
authorBen Hutchings <bhutchings@solarflare.com>
Fri, 6 Dec 2013 22:28:18 +0000 (22:28 +0000)
committerBen Hutchings <bhutchings@solarflare.com>
Fri, 6 Dec 2013 22:28:18 +0000 (22:28 +0000)
commit2dd6426597eb642197a0bdb13d096acb1164b958
tree3fa800e7510d25bb8956e8fdc1be52b9e07c81ab
parentf54b311142a92ea2e42598e347b84e1655caf8e3
parent6b294b8efedaa7cf7507154148e2c79766ad6f96
Merge branch 'sfc-3.13' into master

Merge sfc fixes destined for 3.13, as development for 3.14+ depends on
some of them.
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/sfc/nic.h
drivers/net/ethernet/sfc/ptp.c