diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:46:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:46:50 +0200 |
| commit | b1c501e5b5a165228b7d2819265bc70ec610da01 (patch) | |
| tree | 0e36c93144245c3b0641e24bbae2047256c1057f /crypto/pcbc.c | |
| parent | ee1ee76b601e4de16246fc4d3f261f4a0c82b01d (diff) | |
| parent | 4da3cf2ff4a51349887201dd1efa1dfbc3a99703 (diff) | |
| download | linux-crypto-b1c501e5b5a165228b7d2819265bc70ec610da01.tar.gz linux-crypto-b1c501e5b5a165228b7d2819265bc70ec610da01.zip | |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions