]> 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)
commit44f2e91f8e1736fcb4f457033f479bf9bdac2fac
tree3fa800e7510d25bb8956e8fdc1be52b9e07c81ab
parent4aed7f27920efe620d846cebb5eab35b881709ce
parente0a72b7ad61b33430a19887e568bab4990791e11
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