diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 05:33:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 05:33:38 +0200 |
commit | efdfce2b7ff3205ba0fba10270b92b80bbc6187d (patch) | |
tree | 6275099128c1e228b79dc0923ae936c24ea5a36f /net/ipv6/esp6.c | |
parent | Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... (diff) | |
parent | ia64: remove paravirt code (diff) | |
download | linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.tar.xz linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.zip |
Merge tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 paravirt removal from Tony Luck:
"Nobody cares about paravirtualization on ia64 anymore"
* tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: remove paravirt code
Diffstat (limited to 'net/ipv6/esp6.c')
0 files changed, 0 insertions, 0 deletions