Messages in this thread | | | Date | Fri, 31 Jul 2009 10:33:54 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm tree with Linus' tree |
| |
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in MAINTAINERS between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS: coalesce name and email address lines") from Linus' tree and commit d19d36672ee379f26b79df985a9a2e5afb3f1df1 ("[ARM] 5599/1: MAINTAINERS: update for EP93XX ARM") from the arm tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS index 79471ba,1be6a0c..0000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -535,12 -604,18 +535,15 @@@ W: http://maxim.org.za/at91_26.htm S: Maintained ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE - M: Lennert Buytenhek <kernel@wantstofly.org> -P: Hartley Sweeten -M: hsweeten@visionengravers.com -P: Ryan Mallon -M: ryan@bluewatersys.com ++M: Hartley Sweeten <hsweeten@visionengravers.com> ++M: Ryan Mallon <ryan@bluewatersys.com> L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained + F: arch/arm/mach-ep93xx/ + F: arch/arm/mach-ep93xx/include/mach/ ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT -P: Lennert Buytenhek -M: kernel@wantstofly.org +M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained
| |