git.stricted.de - GitHub/exynos8895/android_kernel_samsung

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

author	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 24 May 2011 18:53:42 +0000 (11:53 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 24 May 2011 18:53:42 +0000 (11:53 -0700)
commit	5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f
tree	799e309a7db032cb7abe9f0fa910c2989c3fdab5	tree \| snapshot (tar.gz zip)
parent	4d429480352c63db2228489f0db9fd381cdc3c9c	commit \| diff
parent	6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0	commit \| diff

Merge branch 'for-2.6.40' of git://git./linux/kernel/git/tj/percpu

* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Unify input section names
  percpu: Avoid extra NOP in percpu_cmpxchg16b_double
  percpu: Cast away printk format warning
  percpu: Always align percpu output section to PAGE_SIZE

Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun

RSS Atom

arch/alpha/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/m32r/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/parisc/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/percpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
mm/percpu.c	diff1 \|	diff2 \|	blob \| history