| commit | f88cf73d80cca0c56bb35168cc857d1c78c8c0b9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Aug 24 16:23:31 2012 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri Aug 24 16:23:31 2012 -0400 |
| tree | 9ab9160abac94d9a646a5e1b464084364f048698 | |
| parent | cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a [diff] | |
| parent | ac70b2e9a13423b5efa0178e081936ce6979aea5 [diff] |
Merge branch 'sfc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc Ben Hutchings says: ==================== Simple fix for a braino. Please also queue this for the 3.4 and 3.5 stable series. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>