From: Linus Torvalds Date: Sat, 26 Mar 2011 03:51:44 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm X-Git-Tag: v2.6.39-rc1~57 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=44bbd7ac2658eb1118342493026ef141e259b739 Merge git://git./linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm stripe: implement merge method dm mpath: allow table load with no priority groups dm mpath: fail message ioctl if specified path is not valid dm ioctl: add flag to wipe buffers for secure data dm ioctl: prepare for crypt key wiping dm crypt: wipe keys string immediately after key is set dm: add flakey target dm: fix opening log and cow devices for read only tables --- 44bbd7ac2658eb1118342493026ef141e259b739