diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:29:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:29:19 -0700 |
| commit | ddc39f90a956b1ce49213e057d32fc94253e20f6 (patch) | |
| tree | 2027362a1fa0632cd7a797add3545431adfe76f5 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | alpha: Fix de2104x driver failing to readout MAC address correctly (diff) | |
| download | linux-dev-ddc39f90a956b1ce49213e057d32fc94253e20f6.tar.xz linux-dev-ddc39f90a956b1ce49213e057d32fc94253e20f6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix de2104x driver failing to readout MAC address correctly
alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
alpha: fix pci_mmap_resource API breakage
alpha: fix __arch_hweight32 typo
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions