| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Tue Jan 05 09:17:33 2010 +0900 |
| committer | Tejun Heo <tj@kernel.org> | Tue Jan 05 09:17:33 2010 +0900 |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 [diff] | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 [diff] |
Merge branch 'master' into percpu Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h