Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638
authorBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:24:46 +0000 (22:24 +0000)
committerBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:24:46 +0000 (22:24 +0000)
commit084b7c83830fab95bd686e2b0b5321dec0300a96
tree1881005a1e01a10e4a2f8765628309dd4068e862
parent7f42f9fef7bbc4f3250a33bf58170c640cd3db18
parent747fcc91cb5bade1f681b3a8d0e6d4f697d865fd
Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638