From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 8 Sep 2005 22:43:09 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
X-Git-Tag: v2.6.14-rc1~492^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0d6f9663b30a09ed725229b2d50391268c8538e;p=users%2Fjedix%2Flinux-maple.git

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

Old tree, so the automatic merge had some problems.
---

c0d6f9663b30a09ed725229b2d50391268c8538e