summaryrefslogtreecommitdiffstats
path: root/drivers/ide/qd65xx.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 01:52:10 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 01:52:10 +0100
commit7420b73dc05ae1faa36b49774210a13d29349c53 (patch)
tree90cdba18724099353598e69b3ee9ee21df9582cf /drivers/ide/qd65xx.c
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentMerge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tm... (diff)
downloadlinux-7420b73dc05ae1faa36b49774210a13d29349c53.tar.xz
linux-7420b73dc05ae1faa36b49774210a13d29349c53.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: NVRAM depends on RTC_DRV_CMOS rename platform_driver name "flash" to "sa1100-mtd" annotate that [fp, #-4] is the saved lr Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock ARM: OMAP: fix fault in enter_full_retention() ARM: OMAP: Mask interrupts when disabling interrupts, v2 ARM: OMAP: gptimer min_delta_ns corrected ARM: OMAP: Fix hsmmc init, v2 ARM: OMAP: Fix omap34xx revision detection for ES3.1 ARM: OMAP: DMA: Fix uninitialized channel flags ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling ARM: OMAP: Fix McBSP spin_lock deadlock [ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches [ARM] call undefined instruction exception handler with irqs enabled [ARM] msm: fix build errors [ARM] etherh: continue fixing build failure
Diffstat (limited to 'drivers/ide/qd65xx.c')
0 files changed, 0 insertions, 0 deletions