Message ID | 4F44293E.2090901@gmail.com |
---|---|
State | New |
Headers | show |
On Tue, Feb 21, 2012 at 05:31:10PM -0600, Rob Herring wrote: > Please pull entry-macro clean-up for 3.4. This should be pretty much > free of any conflicts AFAICT. A merge of your for-next branch had no > conflicts. I'll pull this into my for-armsoc branch because it makes sense for both trees to carry it. It'll appear there in a few days time.
On Wed, Feb 22, 2012 at 10:06:28PM +0000, Russell King - ARM Linux wrote: > On Tue, Feb 21, 2012 at 05:31:10PM -0600, Rob Herring wrote: > > Please pull entry-macro clean-up for 3.4. This should be pretty much > > free of any conflicts AFAICT. A merge of your for-next branch had no > > conflicts. > > I'll pull this into my for-armsoc branch because it makes sense for > both trees to carry it. It'll appear there in a few days time. I should point out that it will appear in -next before it appears in for-armsoc (because I won't be updating for-armsoc until I'm ready to push it out for that.)