aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 13:30:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 13:30:40 -0700
commit860da5e578c25d1ab4528c0d1ad13f9969e3490f (patch)
treeaa9d8f843223b6acfd86513881fa7aac2a7b439b /drivers/ata
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff)
parentdrm/i915: save and restore dsparb and d_state registers. (diff)
downloadlinux-dev-860da5e578c25d1ab4528c0d1ad13f9969e3490f.tar.xz
linux-dev-860da5e578c25d1ab4528c0d1ad13f9969e3490f.zip
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: save and restore dsparb and d_state registers. drm/i915: fix off by one in VGA save/restore of AR & CR regs. drm: disable tasklets not IRQs when taking the drm lock spinlock Revert "drm/vbl rework: rework how the drm deals with vblank."
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions