aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_eth.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-12-01 11:56:03 +0100
committerIngo Molnar <mingo@kernel.org>2012-12-01 11:56:03 +0100
commitfd6da696f38b00ffeae1185d6f0ec5d4ab3b472d (patch)
tree27a52ff8c74ec62f604f72e68255df884ec5c112 /net/l2tp/l2tp_eth.c
parentMerge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff)
parentperf kvm: Fix building perf kvm on non x86 arches (diff)
downloadlinux-dev-fd6da696f38b00ffeae1185d6f0ec5d4ab3b472d.tar.xz
linux-dev-fd6da696f38b00ffeae1185d6f0ec5d4ab3b472d.zip
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo: - Don't build 'perf kvm stat" on non-x86 arches, fix from Xiao Guangrong. - UAPI fixes to get perf building again in non-x86 arches, from David Howells. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/l2tp/l2tp_eth.c')
0 files changed, 0 insertions, 0 deletions