tree b3ef50ff649d689bd425b68f3173dfab3e1f10a2
parent 4117b61f7200cc83d509ed226e4d8239e4d6044b
parent da16e3245a4827d969943ca0493a4a6e34009342
author Linus Torvalds <torvalds@g5.osdl.org> 1126736404 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126736404 -0700

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