Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
authorBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:25:32 +0000 (22:25 +0000)
committerBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:25:32 +0000 (22:25 +0000)
commitadeaf46d311715deee9ae38ef1edb0d6b6fb0d55
tree0fb18544cbc4d653375ed15ec5339534e58d69d7
parent428dcc19374c9ebcf8fee057057c9023174c1b2a
parent6d779a4c3f97023fe329ef33aba25c8aaadf281b
Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638