Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6

This commit is contained in:
Linus Torvalds 2005-06-01 07:56:10 -07:00
commit a340ba1071
2 changed files with 37 additions and 15 deletions