diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-05 03:17:33 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-05 03:17:33 +0300 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /CREDITS | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| download | linux-32032df6c2f6c9c6b2ada2ce42322231824f70c2.tar.xz | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions