diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:43:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:43:50 -0700 |
| commit | 74aec4e0dd93d4202d3d5a692723f39cc5332b15 (patch) | |
| tree | 33affbfd65e4a1bfe3b27df6bd91baa2dfb593f7 /tools/perf/scripts/python | |
| parent | Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (diff) | |
| parent | ecryptfs: Make inode bdi consistent with superblock bdi (diff) | |
| download | linux-dev-74aec4e0dd93d4202d3d5a692723f39cc5332b15.tar.xz linux-dev-74aec4e0dd93d4202d3d5a692723f39cc5332b15.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
ecryptfs: Make inode bdi consistent with superblock bdi
eCryptfs: Unlock keys needed by ecryptfsd
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions