err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: d42510a) | patch

author	Len Brown <len.brown@intel.com>
	Fri, 16 Jun 2006 02:19:31 +0000 (22:19 -0400)
committer	Len Brown <len.brown@intel.com>
	Fri, 16 Jun 2006 02:19:31 +0000 (22:19 -0400)
commit	785fcccd68bd4dc436f75fd4cd40e8557966c86d
tree	92fbac7035de7751a9db89c4761e4bdbac346749	tree \| snapshot
parent	d42510a0f58c2583c37c8e9b7548e3a68545863a	commit \| diff

ACPI: resolve merge conflict between sem2mutex and processor_perflib.c

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/processor_perflib.c

diff | blob | history

Linux 2.6 source tree