From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 25 Jul 2006 03:00:35 +0000 (-0700)
Subject: Merge ../g
X-Git-Tag: v2.6.17.7~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5e589b98ec7dc0f1bb92d1142cea3d3e383cfaf;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge ../g

Conflicts:

	queue-2.6.17/fix-ondemand-vs-suspend-deadlock.patch
	rejects/fix-ondemand-vs-suspend-deadlock.patch
	review-2.6.17/fix-ondemand-vs-suspend-deadlock.patch
	review-2.6.17/series
---

e5e589b98ec7dc0f1bb92d1142cea3d3e383cfaf