tree 3fa800e7510d25bb8956e8fdc1be52b9e07c81ab
parent f54b311142a92ea2e42598e347b84e1655caf8e3
parent 6b294b8efedaa7cf7507154148e2c79766ad6f96
author Ben Hutchings <bhutchings@solarflare.com> 1386368898 +0000
committer Ben Hutchings <bhutchings@solarflare.com> 1386368898 +0000

Merge branch 'sfc-3.13' into master

Merge sfc fixes destined for 3.13, as development for 3.14+ depends on
some of them.