Conflict between Versatile Express DT conversion and local timer updates

[Russell King - ARM Linux]

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.