diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-17 15:47:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-17 15:47:30 +0000 |
| commit | 7d78c887a94067ba218dc71b89d0d7a09415197f (patch) | |
| tree | ff87df902888694cada5173e91edeee6119a8d7e /drivers/acpi/utils.c | |
| parent | 0db169f9703115bab09eda5d89a8f6937a7bf98e (diff) | |
| download | op-kernel-dev-7d78c887a94067ba218dc71b89d0d7a09415197f.zip op-kernel-dev-7d78c887a94067ba218dc71b89d0d7a09415197f.tar.gz | |
[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/acpi/utils.c')
0 files changed, 0 insertions, 0 deletions
