Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638
authorBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:24:51 +0000 (22:24 +0000)
committerBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:24:51 +0000 (22:24 +0000)
commitc5ba47ba7f3810adf4974ed4fe7134327333130d
tree59866b36bfbfc1a763b3c0e1354ed0119a711e91
parent084b7c83830fab95bd686e2b0b5321dec0300a96
parentd9240e612ba79287e29f2eac52f94a2016fb0914
Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638