On Sun, Dec 12, 2010 at 02:55:40AM -0800, Saravana Kannan wrote:
So, I tried to apply this against my local tree to avoid collisions with
it but it doesn't apply so I suspect Liam will have trouble also, there
are several updates in there that overlap with your change. Please
regenerate against -next or Liam's tree:
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
You should always submit changes against the development versions of
code, generally -next will have these merged into it.
--