| commit | 92352420785fd167f29867a4f92df18fb8635550 | |
| author | Dominic Duklas <dodo1122@googlemail.com> | |
| Sat, 12 Apr 2008 01:11:10 +0000 (12 02:11 +0100) | ||
| committer | Dominic Duklas <dodo1122@googlemail.com> | |
| Sat, 12 Apr 2008 01:11:10 +0000 (12 02:11 +0100) | ||
| tree | 602510249c3a61bd39683ffb7e7aff30c16571cd | treesnapshot (tar.gz zip) |
| parent | c78d6d575eb53c51aa45e2ef25e069f75a16cf22 | commitdiff |
| parent | 6e3f97bd65ecef39ff3892c21bcf6618b5bd50d4 | commitdiff |
Merge branch 'thinkpad-devel' into master-devel
Conflicts:
drivers/misc/Makefile
Conflicts:
drivers/misc/Makefile
| drivers/hwmon/Kconfig | diff1 | diff2 | blobhistory |
| drivers/misc/Makefile | diff1 | diff2 | blobhistory |