summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-20 00:50:03 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-20 00:50:03 +0100
commit4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7 (patch)
tree394733989d9f68e8380ace4948976a92336e6b16 /include/net
parentMerge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentsparc64: merge fix (diff)
downloadlinux-4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7.tar.xz
linux-4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Two merge window fallout build fixes" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: merge fix sparc64: fix build regession
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions