On Wed, Mar 20, 2013 at 09:13:24AM -0700, Tony Lindgren wrote: > * Felipe Balbi <balbi@xxxxxx> [130320 09:00]: > > On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: > > > Add clk_rate parameter to platform data. If supplied, the > > > NOP phy driver will program the clock to that rate during probe. > > > > > > Also add 2 flags, needs_vcc and needs_reset. > > > If the flag is set and the regulator couldn't be found > > > then the driver will bail out with -EPROBE_DEFER. > > > > > > Signed-off-by: Roger Quadros <rogerq@xxxxxx> > > > Acked-by: Felipe Balbi <balbi@xxxxxx> > > > > Hi Tony, > > > > maybe you might prefer to merge commit 1f0972f from my next branch which > > is exactly this patch. Basically, if you: > > > > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next > > $ git merge 1f0972f > > > > you get $SUBJECT and can apply the others without fear of conflicts > > later. > > OK thanks will use commit 1f0972f, so let's consider that commit immutable. yeah, once it hits my 'next' branch, I don't rebase anymore. cheers ps: that's valid for 'next' and 'fixes' -- balbi
Attachment:
signature.asc
Description: Digital signature
