diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 07:37:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 07:37:49 +0200 |
commit | dc3f81b129b5439ba7bac265bbc6a51a39275dae (patch) | |
tree | 216030731d911249496d2e97206cd61431e31c89 /arch/arm/mach-pxa/cm-x2xx-pci.c | |
parent | perf_counter, x86: fix zero irq_period counters (diff) | |
parent | Linux 2.6.30-rc6 (diff) | |
download | linux-dc3f81b129b5439ba7bac265bbc6a51a39275dae.tar.xz linux-dc3f81b129b5439ba7bac265bbc6a51a39275dae.zip |
Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx-pci.c')
0 files changed, 0 insertions, 0 deletions