| commit | 50de1a8ef18da0cfff97543315b4e042e8bb7c83 | |
| author | Tejun Heo <tj@kernel.org> | |
| Tue, 8 Dec 2009 01:02:12 +0000 (8 10:02 +0900) | ||
| committer | Tejun Heo <tj@kernel.org> | |
| Tue, 8 Dec 2009 01:02:12 +0000 (8 10:02 +0900) | ||
| tree | 86056d1aef0e83d7839a8350c9e6109b80b3cfa5 | treesnapshot (tar.gz zip) |
| parent | 390dfd95c5df1ab3921dd388d11b2aee332c3f2c | commitdiff |
| parent | ee0a6efc1897ef817e177e669f5c5d211194df24 | commitdiff |
Merge branch 'for-linus' into for-next
Conflicts:
mm/percpu.c
Conflicts:
mm/percpu.c
| include/linux/percpu.h | diff1 | diff2 | blobhistory |
| kernel/sched.c | diff1 | diff2 | blobhistory |
| mm/percpu.c | diff1 | diff2 | blobhistory |