summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_ixp4xx_cf.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-23 05:33:29 +0200
committerLen Brown <len.brown@intel.com>2008-10-23 05:33:29 +0200
commit7674416db4ee3d43813dddb650364ca994755256 (patch)
tree1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/ata/pata_ixp4xx_cf.c
parentMerge branch 'thinkpad' into test (diff)
parentACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernels (diff)
downloadlinux-7674416db4ee3d43813dddb650364ca994755256.tar.xz
linux-7674416db4ee3d43813dddb650364ca994755256.zip
Merge branch 'ull' into test
Conflicts: drivers/acpi/bay.c drivers/acpi/dock.c drivers/ata/libata-acpi.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/ata/pata_ixp4xx_cf.c')
0 files changed, 0 insertions, 0 deletions