]> git.proxmox.com Git - mirror_ubuntu-disco-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)
commitbc9be57f85d465506d0d4a8951275dae4e694f16
treea3c47cf5c578227a10e2132abd9151c36d9ed163
parent646032e3b05b32d3f20cb108a030593d9d792eb5
parent56acc7a39ac4ac7638cdc32cd3d0832ebbc834e4
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