On Thu, 2009-02-26 at 13:28 -0800, David Brownell wrote: > On Thursday 26 February 2009, Liam Girdwood wrote: > > Applied with git-am merge conflicts. It builds ok, can you check against > > your tree. > > What were the conflicts -- just offsets? > > Your "-next" regulator tree seems to be missing a doc patch > you had asked for, maybe that's an issue. > > - Dave > > =========== CUT HERE > From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> > Subject: regulator: get_status() grows kerneldoc > > Add kerneldoc for the new get_status() message. Fix the existing > kerneldoc for that struct in two ways: > > (a) Syntax, making sure parameter descriptions immediately > follow the one-line struct description and that the first > blank lines is before any more expansive description; > (b) Presentation for a few points, to highlight the fact that > the previous "get" methods exist only to report the current > configuration, not to display actual status. > > Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> > --- > include/linux/regulator/driver.h | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) Thanks. Fixed. Liam -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html