diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 01:11:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 01:11:15 +0100 |
| commit | 5ed59af85077d28875a3a137b21933aaf1b4cd50 (patch) | |
| tree | d225d654de47ebe480a59d479ae5b3cc7c90cd71 /fs/aio.c | |
| parent | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | futex: Simplify return logic (diff) | |
| download | linux-5ed59af85077d28875a3a137b21933aaf1b4cd50.tar.xz linux-5ed59af85077d28875a3a137b21933aaf1b4cd50.zip | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core/locking changes for v3.4 from Ingo Molnar
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Simplify return logic
futex: Cover all PI opcodes with cmpxchg enabled check
Diffstat (limited to 'fs/aio.c')
0 files changed, 0 insertions, 0 deletions