From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Wed, 22 Feb 2012 22:53:06 +0000 Subject: [PULL] entry-macro.S clean-up and removal In-Reply-To: <20120222220628.GG7041@n2100.arm.linux.org.uk> References: <4F44293E.2090901@gmail.com> <20120222220628.GG7041@n2100.arm.linux.org.uk> Message-ID: <20120222225305.GI7041@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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.)