[LinuxPPS] Git conflicts

[Rodolfo Giometti]

On Sun, Aug 05, 2007 at 12:49:23AM -0500, Philip M. White wrote:
> On Mon, Jul 30, 2007 at 05:27:41PM +0200, Rodolfo Giometti wrote:
> > Mmm... quite strange... did you modify your tree?
> 
> I did not modify my tree, but I can no longer reproduce this.  I spent a
> couple of hours learning Git, and now I can merge the LinuxPPS
> repository with the vanilla kernel without any errors.  Sorry for the
> trouble. :)

The important is that now it works! ;)

Ciao,

Rodolfo

-- 

GNU/Linux Solutions                  e-mail:    giometti at enneenne.com
Linux Device Driver                             giometti at gnudd.com
Embedded Systems                     		giometti at linux.it
UNIX programming                     phone:     +39 349 2432127