aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-27 07:47:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-27 07:47:22 -0800
commit8c022fdd5fc1b9949bad21d26e0cb115d045c7f9 (patch)
treec3aeafc3e7f0fc91711b77ab95c018f684a05aea /arch
parentff2bad5f899421850f7e9bc956450e4c61b0b95d (diff)
parentb98f5046397b9f4c5060e5b73e483bfd9e453dd6 (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata-rb532-cf: remove set_irq_type from finish_io [libata] pata_via: support VX855, future chips whose IDE controller use 0x0571 sata_mv: no longer experimental (v2) sata_mv: msi masking fix (v2) sata_mv: Properly initialize main irq mask sata_mv: remove bogus nsect restriction sata_mv: don't read hc_irq_cause sata_mv: fix 8-port timeouts on 508x/6081 chips sata_nv: fix MCP5x reset sata_nv: rename nv_nf2_hardreset() libata: set NODEV_HINT for 0x7f status libata-sff: fix incorrect EH message
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-integrator/clock.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/clock.h b/arch/arm/mach-integrator/clock.h
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/arch/arm/mach-integrator/clock.h
+++ /dev/null