Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <[email protected]>
Tue, 26 Jul 2011 23:55:45 +0000 (16:55 -0700)
committerLinus Torvalds <[email protected]>
Tue, 26 Jul 2011 23:55:45 +0000 (16:55 -0700)
* 'next-i2c' of git://git.fluff.org/bjdooks/linux:
  i2c-eg20t : Fix the issue of Combined R/W transfer mode
  i2c-eg20t : Support Combined R/W transfer mode
  i2c: Tegra: Add DeviceTree support


Trivial merge