linux-next: Tree for July 8 (nouveau)

2010-07-09 Thread Dave Airlie
On Thu, 2010-07-08 at 09:48 -0700, Randy Dunlap wrote: > On Thu, 8 Jul 2010 15:10:22 +1000 Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20100707: > > > > The i.MX tree mismerge has been fixed. > > > > The omap tree gained a conflict (involving serveral files) against the > > arm

linux-next: Tree for July 8 (nouveau)

2010-07-08 Thread Randy Dunlap
On Thu, 8 Jul 2010 15:10:22 +1000 Stephen Rothwell wrote: > Hi all, > > Changes since 20100707: > > The i.MX tree mismerge has been fixed. > > The omap tree gained a conflict (involving serveral files) against the > arm tree. > >

Re: linux-next: Tree for July 8 (nouveau)

2010-07-08 Thread Randy Dunlap
On Thu, 8 Jul 2010 15:10:22 +1000 Stephen Rothwell wrote: Hi all, Changes since 20100707: The i.MX tree mismerge has been fixed. The omap tree gained a conflict (involving serveral files) against the arm tree.

Re: linux-next: Tree for July 8 (nouveau)

2010-07-08 Thread Dave Airlie
On Thu, 2010-07-08 at 09:48 -0700, Randy Dunlap wrote: On Thu, 8 Jul 2010 15:10:22 +1000 Stephen Rothwell wrote: Hi all, Changes since 20100707: The i.MX tree mismerge has been fixed. The omap tree gained a conflict (involving serveral files) against the arm tree.