Messages in this thread | | | Date | Wed, 12 Sep 2012 13:43:49 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the mfd tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd: 88pm860x: Use REG resource for backlight") from the mfd tree and commit e1c9ac420ef1 ("Revert "backlight: fix memory leak on obscure error path"") from the trivial tree.
I just used the version from the mfd tree and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |