Messages in this thread | | | From | H Hartley Sweeten <> | Date | Thu, 9 Jun 2011 19:28:34 -0500 | Subject | RE: [PATCH trival/tree-wide] Change Ryan Mallon's email address across the kernel |
| |
On Thursday, June 09, 2011 4:13 PM, Ryan Mallon wrote: > > I no longer work at Bluewater Systems. Update my email address accordingly. > > Signed-off-by: Ryan Mallon <rmallon@gmail.com> > Cc: Andre Renaud <andre@bluewatersys.com> > Cc: H Hartley Sweeten <hsweeten@visionengravers.com> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Cc: Andrew Victor <avictor.za@gmail.com> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Anton Vorontsov <cbou@mail.ru> > Cc: Paul Mundt <lethal@linux-sh.org> > Cc: Liam Girdwood <lrg@ti.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Cc: trivial@kernel.org > Cc: linux-kernel@vger.kernel.org > ---
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Ryan,
There will probable be some merge conflicts with this.
> MAINTAINERS | 2 +- > arch/arm/mach-at91/board-snapper9260.c | 2 +- > arch/arm/mach-ep93xx/dma-m2p.c | 2 +-
This file is gone after Mika's DMA patches which are already in linux-next.
> arch/arm/mach-ep93xx/gpio.c | 2 +-
This file has been moved and renamed. There are also a number of patches already applied to it in linux-next.
> arch/arm/mach-ep93xx/simone.c | 4 ++-- > arch/arm/mach-ep93xx/snappercl15.c | 4 ++-- > drivers/mtd/devices/sst25l.c | 4 ++--
There are a couple patches to this file in linux-next.
> drivers/power/ds2782_battery.c | 4 ++-- > drivers/video/ep93xx-fb.c | 2 +- > sound/soc/ep93xx/ep93xx-i2s.c | 4 ++-- > sound/soc/ep93xx/ep93xx-pcm.c | 4 ++-- > sound/soc/ep93xx/snappercl15.c | 4 ++--
The others should be ok. Maybe you should rebase this patch against linux-next?
Regards, Hartley
| |