]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitddd1ad860ffc99c25ac57e310fe2d8761f723b90
tree3fa800e7510d25bb8956e8fdc1be52b9e07c81ab
parentef388114f3f92fc9186199b0b9fd4ec31c51615d
parent5128222a24bede6a4baed6fdc3f0cb3be35092df
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