lkml.org 
[lkml]   [2012]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the trivial tree with the regulator tree
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/regulator/palmas-regulator.c between commit bdc4baacebda
("regulator: palmas: Convert palmas_ops_smps to regulator_[get|
set]_voltage_sel_regmap") from the regulator tree and commit 02582e9bcc36
("treewide: fix typo of "suport" in various comments and Kconfig") from
the trivial tree.

I fixed it up (I used the former as it also fixed the typo) 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]
\
 
 \ /
  Last update: 2012-12-10 05:41    [W:0.026 / U:2.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site