summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2013-12-07 02:28:18 +0400
committerBen Hutchings <bhutchings@solarflare.com>2013-12-07 02:28:18 +0400
commit2dd6426597eb642197a0bdb13d096acb1164b958 (patch)
tree3fa800e7510d25bb8956e8fdc1be52b9e07c81ab /include/linux
parentf54b311142a92ea2e42598e347b84e1655caf8e3 (diff)
parent6b294b8efedaa7cf7507154148e2c79766ad6f96 (diff)
downloadlinux-2dd6426597eb642197a0bdb13d096acb1164b958.tar.xz
Merge branch 'sfc-3.13' into master
Merge sfc fixes destined for 3.13, as development for 3.14+ depends on some of them.
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions