[GIT PULL 3/7] ARM SoC specific changes
olof at lixom.net
Tue Jul 2 20:00:43 EDT 2013
On Tue, Jul 2, 2013 at 4:51 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
> On Tue, Jul 2, 2013 at 4:17 PM, Russell King - ARM Linux
> <linux at arm.linux.org.uk> 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 conflict
(so will sfr) when merging from Russell due to add/add conflicts been
resolved by ordering them in opposite order in
Feel free to flip them back to Russell's preferred ordering at that
time, of course.
More information about the linux-arm-kernel