From e08116c5a3d311298abddae54ec755f9626b850d Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 19 Nov 2010 16:46:26 -0200 Subject: [PATCH] --- yaml --- r: 223829 b: refs/heads/master c: 4aafd3f71a257a3522932944b5204262dfdff147 h: refs/heads/master i: 223827: 54b0d322529b451a8d4a2588654f95088f3ed19e v: v3 --- [refs] | 2 +- trunk/CREDITS | 2 -- trunk/MAINTAINERS | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 945414ea169c..7e7a99b6f9d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a71123977eb3c72dd5a8bac723b13faf9cdd2828 +refs/heads/master: 4aafd3f71a257a3522932944b5204262dfdff147 diff --git a/trunk/CREDITS b/trunk/CREDITS index 41d8e63d5165..494b6e4746d7 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2365,8 +2365,6 @@ E: acme@redhat.com W: http://oops.ghostprotocols.net:81/blog/ P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks -S: R. Brasílio Itiberê, 4270/1010 - Água Verde -S: 80240-060 - Curitiba - Paraná S: Brazil N: Karsten Merker diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8e6548dbd5db..f94cd37d63da 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4602,7 +4602,7 @@ PERFORMANCE EVENTS SUBSYSTEM M: Peter Zijlstra M: Paul Mackerras M: Ingo Molnar -M: Arnaldo Carvalho de Melo +M: Arnaldo Carvalho de Melo S: Supported F: kernel/perf_event*.c F: include/linux/perf_event.h