| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f | [log] [tgz] |
|---|---|---|
| author | Pekka Enberg <penberg@kernel.org> | Sun Oct 24 19:57:05 2010 +0300 |
| committer | Pekka Enberg <penberg@kernel.org> | Sun Oct 24 19:57:05 2010 +0300 |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e [diff] | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e [diff] |
Merge branch 'master' into for-linus Conflicts: include/linux/percpu.h mm/percpu.c