Re: [GIT PULL rcu/next] RCU commits for 3.3

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@xxxxxxxxx> wrote:

> I don't know how you plan to fix the conflict, by redoing the 
> merge or by applying a patch on tip/master.

I've re-done the merge - thanks guys!

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/