linux-next: manual merge of the mfd tree with Linus' tree
From: Stephen Rothwell <hidden>
Date: 2012-10-03 04:12:30
Also in:
lkml
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/video/backlight/88pm860x_bl.c between commit e1c9ac420ef1
("Revert "backlight: fix memory leak on obscure error path"") from Linus'
tree and commit a6ccdcd98c39 ("mfd: 88pm860x: Use REG resource for
backlight") from the mfd tree.
I used the mfd tree version and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au Attachments
- (unnamed) [application/pgp-signature] 836 bytes