From: Linus Torvalds Date: Thu, 3 Jul 2008 01:55:17 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm X-Git-Tag: v2.6.26-rc9~81 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cefcade9e7b2331110fdd709b5871ebcc5f9a40f;p=linux-2.6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm crypt: use cond_resched --- cefcade9e7b2331110fdd709b5871ebcc5f9a40f