diff options
| author | Russell King | 2005-11-17 16:47:30 +0100 |
|---|---|---|
| committer | Russell King | 2005-11-17 16:47:30 +0100 |
| commit | 7d78c887a94067ba218dc71b89d0d7a09415197f (patch) | |
| tree | ff87df902888694cada5173e91edeee6119a8d7e /drivers/hwmon | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-qcow2-linux-7d78c887a94067ba218dc71b89d0d7a09415197f.tar.gz kernel-qcow2-linux-7d78c887a94067ba218dc71b89d0d7a09415197f.tar.xz kernel-qcow2-linux-7d78c887a94067ba218dc71b89d0d7a09415197f.zip | |
[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/hwmon')
0 files changed, 0 insertions, 0 deletions