git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f54b311 6b294b8)
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)
Merge sfc fixes destined for 3.13, as development for 3.14+ depends on
some of them.

1  2 
drivers/net/ethernet/sfc/efx.c patch | diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/nic.h patch | diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ptp.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge
diff --cc drivers/net/ethernet/sfc/nic.h
Simple merge
diff --cc drivers/net/ethernet/sfc/ptp.c
Simple merge
Pandora Kernel Repository