]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa065ff acb4e83)
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)
commit0849f98336fe185415087e76cbdb08b31da23db5
tree33e64fc453619978c3ecc86c7ec3649db3b4d8dctree | snapshot
parentfa065ffceb6bbdebe7fbd7f010fff5a4b184599acommit | diff
parentacb4e83737d4ecb15ec2ac115bb8dd51293d78dccommit | 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
401e95421271 ("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
Linux Kernel Source Tree.