Conflict between Versatile Express DT conversion and local timer updates

[Stephen Rothwell]

Hi Russell,

On Thu, 15 Mar 2012 09:36:15 +0000 Russell King - ARM Linux <linux at arm.linux.org.uk> wrote:
>
> On Thu, Mar 15, 2012 at 09:21:40AM +0000, Russell King - ARM Linux wrote:
> > It shouldn't be in my tree anymore - I removed it a couple of days ago
> > and pushed that out.
> 
> Sorry, it didn't get pushed out (the last push was 10 mins before I
> removed it.  So yes, you're right.  Should be gone in your next pull.

Thanks for that.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120315/b7f02718/attachment.sig>