From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Jun 2009 19:44:14 +0000 (-0700)
Subject: Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Tag: v2.6.31-rc1~60
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=b5bdd43876e475724c662f99206f0349c67e33e6;p=net-next-2.6.git

Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c: Fix stuck transaction on cpm-i2c driver
  i2c-omap: Fix build breaking typo cpu_is_omap_2430
---

b5bdd43876e475724c662f99206f0349c67e33e6