diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-25 19:00:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-25 19:00:55 -0700 |
commit | 71e9e6a5823a6b7976c3e47e2f6c7ba364526a93 (patch) | |
tree | ecfa8b3dfd8453dc632199890df3f065cedb1bd0 /fs/ecryptfs/ecryptfs_kernel.h | |
parent | 9ade0cf440a1e5800dc68eef2e77b8d9d83a6dff (diff) | |
parent | 9cf3b5fa6f7b246784d62a2a7637a871290c9ab9 (diff) |
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
rtc: fix coh901331 startup crash
mach-ux500: fix i2c0 device setup regression
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
0 files changed, 0 insertions, 0 deletions