diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 00:49:31 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 00:49:31 +0100 |
commit | e87e7be92979480ee5a2d4a746dc88f2eeca79ca (patch) | |
tree | e30366e742d61bdeb2ad5ba13859b14480213224 /net/ipv4/ping.c | |
parent | Merge tag 'arc-v3.13-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | kernel/bounds: avoid circular dependencies in generated headers (diff) | |
download | linux-e87e7be92979480ee5a2d4a746dc88f2eeca79ca.tar.xz linux-e87e7be92979480ee5a2d4a746dc88f2eeca79ca.zip |
Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 fix from Tony Luck:
"Unbreak ia64 build by avoiding circular dependency"
* tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
kernel/bounds: avoid circular dependencies in generated headers
Diffstat (limited to 'net/ipv4/ping.c')
0 files changed, 0 insertions, 0 deletions