diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 02:25:00 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 02:25:00 +0100 |
| commit | 3b71710f081e90f9682a65d479cf8ae038d74213 (patch) | |
| tree | 88b152f9ae06a08e72ae590d447c1b7c43af68fc /drivers/rtc/rtc-mrst.c | |
| parent | drm/i915: Do not handle backlight combination mode specially (diff) | |
| parent | eCryptfs: Copy up lower inode attrs in getattr (diff) | |
| download | linux-3b71710f081e90f9682a65d479cf8ae038d74213.tar.xz linux-3b71710f081e90f9682a65d479cf8ae038d74213.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
eCryptfs: Copy up lower inode attrs in getattr
ecryptfs: read on a directory should return EISDIR if not supported
eCryptfs: Handle NULL nameidata pointers
eCryptfs: Revert "dont call lookup_one_len to avoid NULL nameidata"
Diffstat (limited to 'drivers/rtc/rtc-mrst.c')
0 files changed, 0 insertions, 0 deletions