diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-19 00:56:25 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-19 00:56:25 +0200 |
commit | 73f1f5dd3ee3ec6e20768d831d9759b0330fad0e (patch) | |
tree | 22f8498c47467f468dce6c3bca0eb1f3a0c9ade0 /crypto/pcrypt.c | |
parent | proc: move fd symlink i_mode calculations into tid_fd_revalidate() (diff) | |
parent | frv: delete incorrect task prototypes causing compile fail (diff) | |
download | linux-73f1f5dd3ee3ec6e20768d831d9759b0330fad0e.tar.xz linux-73f1f5dd3ee3ec6e20768d831d9759b0330fad0e.zip |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc fixes from Andrew Morton.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (4 patches)
frv: delete incorrect task prototypes causing compile fail
slub: missing test for partial pages flush work in flush_all()
fs, proc: fix ABBA deadlock in case of execution attempt of map_files/ entries
drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01
Diffstat (limited to 'crypto/pcrypt.c')
0 files changed, 0 insertions, 0 deletions