tree 7ba471cf9632097682ab55689cd64c9a68e11235
parent 0db7443b2bd0b92da4e8afa46f8123a7076136c6
parent 6fd60fa97b706e52abba7c9f810b148aa230817f
author Linus Torvalds <torvalds@g5.osdl.org> 1126219389 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126219389 -0700

Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

Old tree, so the automatic merge had some problems.