diff options
author | 2010-05-04 15:20:37 -0700 | |
---|---|---|
committer | 2010-05-04 15:20:37 -0700 | |
commit | c81406d6423416f1e18a8a41a3b7ac415fdf13d3 (patch) | |
tree | a0a41d81d102670cc37b0ce5e8373b66f09b27e1 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | i2c-core: Use per-adapter userspace device lists (diff) | |
download | linux-dev-c81406d6423416f1e18a8a41a3b7ac415fdf13d3.tar.xz linux-dev-c81406d6423416f1e18a8a41a3b7ac415fdf13d3.zip |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-core: Use per-adapter userspace device lists
i2c: Fix probing of FSC hardware monitoring chips
i2c-core: Erase pointer to clientdata on removal
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions