On Wed, 30 Apr 2008, Len Brown wrote: > > please pull from: > > git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release Ok, this clashed in some nasty ways in drivers/acpi/video.c due to the non-racy /proc file creation changes that came through Andrew. I fixed up the result, and it *looks* sane (and compiles), but I didn't actually test it, and I don't know the code well. Can you double-check. There were some (smaller) rejects in drivers/misc/intel_menlow.c due to two different versions of the same patch from Julia Lawall (again, the other came through Andrew), and I picked the one from Andrew because it had the later date. But again, you should double-check. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
