diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 19:32:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 19:32:05 -0800 |
commit | 46fbdf8935544dcde440bd807b50e52ed2ca7f3b (patch) | |
tree | 9d1e7838206771f830333036ebaf961894c0c6e3 /fs/ecryptfs/keystore.c | |
parent | a0863130757f32df602c1c60326530c0152b626b (diff) | |
parent | 9821b1f4a145b20db08108362f0b4caf4f0832a1 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
[Blackfin] arch: current_l1_stack_save is a pointer, so use NULL rather than 0
[Blackfin] arch: fix atomic and32/xor32 comments and ENDPROC markings
[Blackfin] arch: fix bug - allow SDH driver to be used as module
[Blackfin] arch: to kill syscalls missing warning by adding new timerfd syscalls
Diffstat (limited to 'fs/ecryptfs/keystore.c')
0 files changed, 0 insertions, 0 deletions