diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 22:08:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 22:08:28 +0100 |
| commit | 6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5 (patch) | |
| tree | 33e64fc453619978c3ecc86c7ec3649db3b4d8dc /fs/quota/quota_tree.h | |
| parent | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg... (diff) | |
| parent | percpu: Remove irqsafe_cpu_xxx variants (diff) | |
| download | linux-6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5.tar.xz linux-6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5.zip | |
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Remove irqsafe_cpu_xxx variants
Fix up conflict in arch/x86/include/asm/percpu.h due to clash with
cebef5beed3d ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()")
which edited the (now removed) irqsafe_cpu_cmpxchg*_double code.
Diffstat (limited to 'fs/quota/quota_tree.h')
0 files changed, 0 insertions, 0 deletions