]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2011 15:46:50 +0000 (08:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2011 15:46:50 +0000 (08:46 -0700)
commit2323e529b6161f234ae54e3359d13b3ee81b6fd4
treea3c47cf5c578227a10e2132abd9151c36d9ed163
parent56469e59806f775276d926e85f5addf6a0cf223d
parent6a970b0dea81dc7091af6a384bda0b8d7bd3c72c
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/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