linux-next: please cleanup the cpuidle tree

[Stephen Rothwell]

Hi Daniel,

All the commits in the cpuidle tree have been included upstream before
v3.6-rc1.  They were rewritten before being merged upstream and so are
now causing merge conflicts in linux-next.  Could you please reset the
head of your tree
(git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next) to
be somewhere in the tree that yours is merged into (pm or Linus').

Alternatively, if you are not using it any more, let me know and I will
remove it from linux-next.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature