summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/timer-gp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 23:35:07 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 23:35:07 (GMT)
commitf82bc1762e0e74b7e0040a4d83be06d32c37fc2e (patch)
tree685e0c3b5a962928efb66e36d9185febddaf5964 /arch/arm/mach-omap2/timer-gp.c
parent4ebd9ab387b39c44165cd296a6637082a4f0f66a (diff)
parent4cca56c50427eecfa2428cdee722848cd82f443c (diff)
downloadlinux-fsl-qoriq-f82bc1762e0e74b7e0040a4d83be06d32c37fc2e.tar.xz
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] sdhci: remove duplicate error message [MMC] sdhci: force DMA on some controllers [MMC] sdhci: quirk for broken reset [MMC] sdhci: Add SDHCI controller ids
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.c')
0 files changed, 0 insertions, 0 deletions