]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
projects / thirdparty / kernel / stable-queue.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd797f4 85ee149)
Merge ../g
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 25 Jul 2006 03:00:35 +0000 (20:00 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 25 Jul 2006 03:00:35 +0000 (20:00 -0700)
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


Trivial merge
Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git