diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-09-16 14:11:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 14:11:43 -0700 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /tools/perf/scripts/python | |
| parent | sparc32: Use PROM device probing for sun4m timer registers. (diff) | |
| parent | sparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions