Re: [GIT PULL 3/7] ARM SoC specific changes

2013-07-03 Thread Arnd Bergmann
On Wednesday 03 July 2013, Russell King - ARM Linux wrote: > Please don't merge this yet. > > Arnd has just done the worst possible thing - the arm-soc tree has taken > bits of my tree, merged them into their own tree, had the same conflicts > I've had, and then resolved them differently. > > The

Re: [GIT PULL 3/7] ARM SoC specific changes

2013-07-02 Thread Olof Johansson
On Tue, Jul 2, 2013 at 4:51 PM, Linus Torvalds wrote: > On Tue, Jul 2, 2013 at 4:17 PM, Russell King - ARM Linux > wrote: >> Please don't merge this yet. > > Oops, too late. The ARM SoC pull requests got merged a couple of hours ago.. It should hopefully not be a big problem, you'll see a merge

Re: [GIT PULL 3/7] ARM SoC specific changes

2013-07-02 Thread Linus Torvalds
On Tue, Jul 2, 2013 at 4:17 PM, Russell King - ARM Linux wrote: > Please don't merge this yet. Oops, too late. The ARM SoC pull requests got merged a couple of hours ago.. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to maj