diff options
author | 2010-09-27 12:26:33 -0700 | |
---|---|---|
committer | 2010-09-27 12:26:33 -0700 | |
commit | 9a457a524762edc1bb1ded65b7a75c01738632d5 (patch) | |
tree | 19b8b7584abd26f1b3d2390fd5523af0182fad42 /tools/perf/scripts/python/syscall-counts.py | |
parent | Merge git://git.infradead.org/iommu-2.6 (diff) | |
parent | pcmcia: pd6729: Fix error path (diff) | |
download | linux-dev-9a457a524762edc1bb1ded65b7a75c01738632d5.tar.xz linux-dev-9a457a524762edc1bb1ded65b7a75c01738632d5.zip |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: pd6729: Fix error path
pcmcia: preserve configuration information if request_io fails partly
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions