From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 18:40:24 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v3.12-rc1~5268
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f4a12210774eb31c3435a5bc21d57aa20647aeb;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: Allow i2c_add_numbered_adapter() to assign a bus id
  i2c-ali1535: Fix style issues
---

3f4a12210774eb31c3435a5bc21d57aa20647aeb