diff options
author | 2010-01-05 09:17:33 +0900 | |
---|---|---|
committer | 2010-01-05 09:17:33 +0900 | |
commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
tree | b1ce838a37044bb38dfc128e2116ca35630e629a /drivers/base/module.c | |
parent | percpu: refactor the code in pcpu_[de]populate_chunk() (diff) | |
parent | Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux (diff) | |
download | wireguard-linux-32032df6c2f6c9c6b2ada2ce42322231824f70c2.tar.xz wireguard-linux-32032df6c2f6c9c6b2ada2ce42322231824f70c2.zip |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'drivers/base/module.c')
0 files changed, 0 insertions, 0 deletions