Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jul 2011 18:40:24 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jul 2011 18:40:24 +0000 (11:40 -0700)
commit3f4a12210774eb31c3435a5bc21d57aa20647aeb
tree9a09e4717969f755c22071cc306ec253d2ecc0e3
parent8ded371f81fba8b38a049f8c5f30ce6438fc7b75
parent488bf314bf219c66922305a1a320950efa86662f
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