diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 20:51:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 20:51:22 +0100 |
commit | 03ed6a3aa600c48593c3984812fda2d5945ddb46 (patch) | |
tree | 03d1357411424514943deffadbb9f287288998bd /drivers/i2c/busses/i2c-iop3xx.c | |
parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
download | linux-03ed6a3aa600c48593c3984812fda2d5945ddb46.tar.xz linux-03ed6a3aa600c48593c3984812fda2d5945ddb46.zip |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix callchain hit bad cast on ascii display
arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU
watchdog: Improve initialisation error message and documentation
Diffstat (limited to 'drivers/i2c/busses/i2c-iop3xx.c')
0 files changed, 0 insertions, 0 deletions