From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 May 2011 15:46:50 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: MMI-PSA29.97-13-9~19839
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc9be57f85d465506d0d4a8951275dae4e694f16;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-parport: Fix adapter list handling
  i2c-i801: Move device ID definitions to driver
---

bc9be57f85d465506d0d4a8951275dae4e694f16