diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-09-21 13:55:04 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-09-21 13:55:11 +0200 |
commit | 7ed569206ebe7467b9c912b857ec46cf1c361111 (patch) | |
tree | c3e0b92cc782439c33ae844e2520819a29700897 /arch/mips/include/asm/mach-bcm47xx | |
parent | perf: Undo the per cpu-context timer stuff (diff) | |
parent | Linux 2.6.36-rc5 (diff) | |
download | linux-7ed569206ebe7467b9c912b857ec46cf1c361111.tar.xz linux-7ed569206ebe7467b9c912b857ec46cf1c361111.zip |
Merge commit 'v2.6.36-rc5' into perf/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/include/asm/mach-bcm47xx')
0 files changed, 0 insertions, 0 deletions