diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:51:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-15 09:51:24 +0100 |
| commit | 0ffa798d947f5f5e40690cc9d38e678080a34f87 (patch) | |
| tree | a9e25ba4431de513d4c83201429e9ff301cbaf50 /include/linux/in6.h | |
| parent | 39dc78b6510323848e3356452f7dab9499736978 (diff) | |
| parent | c86e2eaded39843e1bf4f07d1adfab4494f20894 (diff) | |
| parent | c5659b74f052150791750234f92dcfb29d27efa5 (diff) | |
Merge branches 'perf/powerpc' and 'perf/bench' into perf/core
Merge reason: Both 'perf bench' and the pending PowerPC changes
are now ready for the next merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>