| commit | bc9be57f85d465506d0d4a8951275dae4e694f16 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 02 08:46:50 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 02 08:46:50 2011 -0700 |
| tree | a3c47cf5c578227a10e2132abd9151c36d9ed163 | |
| parent | 646032e3b05b32d3f20cb108a030593d9d792eb5 [diff] | |
| parent | 56acc7a39ac4ac7638cdc32cd3d0832ebbc834e4 [diff] |
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