On Thursday, June 09, 2011 4:13 PM, Ryan Mallon wrote:I no longer work at Bluewater Systems. Update my email address accordingly.Acked-by: H Hartley Sweeten<hsweeten@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ryan Mallon<rmallon@xxxxxxxxx>
Cc: Andre Renaud<andre@xxxxxxxxxxxxxxxx>
Cc: H Hartley Sweeten<hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Russell King<linux@xxxxxxxxxxxxxxxx>
Cc: Nicolas Ferre<nicolas.ferre@xxxxxxxxx>
Cc: Andrew Victor<avictor.za@xxxxxxxxx>
Cc: David Woodhouse<dwmw2@xxxxxxxxxxxxx>
Cc: Anton Vorontsov<cbou@xxxxxxx>
Cc: Paul Mundt<lethal@xxxxxxxxxxxx>
Cc: Liam Girdwood<lrg@xxxxxx>
Cc: Mark Brown<broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: trivial@xxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
Ryan,
There will probable be some merge conflicts with this.
MAINTAINERS | 2 +-This file is gone after Mika's DMA patches which are already in linux-next.
arch/arm/mach-at91/board-snapper9260.c | 2 +-
arch/arm/mach-ep93xx/dma-m2p.c | 2 +-
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 ++--There are a couple patches to this file in linux-next.
arch/arm/mach-ep93xx/snappercl15.c | 4 ++--
drivers/mtd/devices/sst25l.c | 4 ++--
drivers/power/ds2782_battery.c | 4 ++--The others should be ok. Maybe you should rebase this patch against
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 ++--
linux-next?
Regards,
Hartley