From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Nov 2010 01:03:23 +0000 (-0400)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v3.12-rc1~8256
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50440c6dcccbf90ee3629407cb13ca09cab7d900;p=kernel%2Fkernel-generic.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-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
  i2c-i801: Handle multiple instances instead of keeping global state
  i2c-i801: Add Intel Patsburg device ID
  i2c: Drop unused I2C_CLASS_TV flags
---

50440c6dcccbf90ee3629407cb13ca09cab7d900