Hi Daniel,

All the commits in the clockevents tree have appeared upstream (as
different commits, unfortunately).  Please clean up your tree it is
just causing unnecessary conflicts.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au