diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:32:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:32:23 -0700 |
| commit | 198aa045601d20f39658c892dc626e16993bae78 (patch) | |
| tree | ef000627fabe4fa3ff1818dc2e591b6417ca1eb6 /fs/ecryptfs/mmap.c | |
| parent | 58be18c4de37b9277b045c0b5bb123a664dac9ed (diff) | |
| parent | adfe7c69891128f5e238a5e6823709b4bb85b340 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Update defconfigs for 2.6.30-rc3
m68k,m68knommu: Wire up preadv and pwritev
scsi: a4000 - Correct driver unregistration in case of failure
Diffstat (limited to 'fs/ecryptfs/mmap.c')
0 files changed, 0 insertions, 0 deletions