| commit | 5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 11:53:42 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 11:53:42 2011 -0700 |
| tree | 799e309a7db032cb7abe9f0fa910c2989c3fdab5 | |
| parent | 4d429480352c63db2228489f0db9fd381cdc3c9c [diff] | |
| parent | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 [diff] |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/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