| commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Jul 11 10:46:50 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Jul 11 10:46:50 2008 +0200 |
| tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 | |
| parent | 0729fbf3bc70870370b4f43d652f05a468dc68b8 [diff] | |
| parent | 70ff05554f91a1edda1f11684da1dbde09e2feea [diff] |
Merge branch 'linus' into core/rcu Conflicts: include/linux/rculist.h kernel/rcupreempt.c Signed-off-by: Ingo Molnar <mingo@elte.hu>