]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db0c2bf 933393f)
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jan 2012 21:08:28 +0000 (13:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jan 2012 21:08:28 +0000 (13:08 -0800)
commit6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5
tree33e64fc453619978c3ecc86c7ec3649db3b4d8dctree | snapshot
parentdb0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3commit | diff
parent933393f58fef9963eac61db8093689544e29a600commit | diff
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.
arch/x86/include/asm/percpu.h diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/net/snmp.h diff1 | diff2 | blob | history
mm/slub.c diff1 | diff2 | blob | history
net/caif/caif_dev.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.