Merge branch 'sfc-3.11'
authorBen Hutchings <bhutchings@solarflare.com>
Wed, 21 Aug 2013 13:19:36 +0000 (14:19 +0100)
committerBen Hutchings <bhutchings@solarflare.com>
Wed, 21 Aug 2013 13:19:36 +0000 (14:19 +0100)
commitabc71bb939e3a789cc33ed46029bdff498bdc3a5
tree704f50b386979e012591183ab2b1ba5280831dab
parent563b44951e76bd23ba3fabcc3a0c708d8f59c5fb
parentf3851b0acc5a75bd33c6d344a2e4f920e1622ff0
Merge branch 'sfc-3.11'

Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.