diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 20:51:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 20:51:44 -0700 |
| commit | 44bbd7ac2658eb1118342493026ef141e259b739 (patch) | |
| tree | a804d3503e48ee8b2bd0dd3c40235e482a75a512 /drivers/media | |
| parent | 24c6d02fe8c34bc958aa4c464efc1cc10d43e29d (diff) | |
| parent | 29915202006c2e7bafe81348eb498ff9a724ac61 (diff) | |
| download | blackbird-obmc-linux-44bbd7ac2658eb1118342493026ef141e259b739.tar.gz blackbird-obmc-linux-44bbd7ac2658eb1118342493026ef141e259b739.zip | |
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 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
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions
