On Tue, Oct 14, 2008 at 01:30:24PM -0700, Tony Lindgren wrote: > And here's the patch for Russell to avoid the merge conflict. > Also in Russell's patch tracking system as patch 5302/1. This evening, only now having the time to investigate what's going on there (as a result of added your other patch to fix the build error I reported on Saturday) it turns out to be much more trivial a conflict than I was suspecting from sfr's description. However, the results of the final merge with 'master' on my devel branch never go to Linus, so your patch may still be required. -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
