Subject: linux-next: manual merge of the block tree with the powerpc-mpe tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 11 Jun 2015 13:40:41 +1000

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
MAINTAINERS between commit a14ab6b6e0ad ("powerpc/cell: Drop
cbe-oss-dev mailing list from MAINTAINERS") from the powerpc-mpe tree
and commit 3715a5d014e1 ("MAINTAINERS: Update ps3vram block driver")
from the block tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc MAINTAINERS
index b09702c197ca,b327ac39e951..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8018,7 -7853,9 +8019,8 @@@ F:	sound/ppc/snd_ps3
  
  PS3VRAM DRIVER
  M:	Jim Paris <[email-masked]>
+ M:	Geoff Levand <[email-masked]>
  L:	[email-masked]
 -L:	[email-masked]
  S:	Maintained
  F:	drivers/block/ps3vram.c