diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 13:57:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 13:57:19 -0800 |
| commit | 970965270315e15b3ec3a3e0d734fb03b85f6875 (patch) | |
| tree | 891b39cb3f388ec79a162f5aa217a23efa421f61 /drivers/ide/cmd640.c | |
| parent | b54eb1795c0cfeb6cc48fdcbd010e800541750ad (diff) | |
| parent | ca9ab10033d190c1ede85fdf456307bdfdabf079 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: Select CONFIG_SHMEM
drm/i915: Fix CRT hotplug detect by checking really no channels attached
agp/intel: new host bridge support
drm/i915: Add more registers save/restore for Ironlake suspend
drm/i915: Fix IRQ stall issue on Ironlake
drm/i915: HDMI hardware workaround for Ironlake
drm/i915: Fix and cleanup DPLL calculation for Ironlake
drm/i915: Avoid potential sleep whilst holding spinlock
Diffstat (limited to 'drivers/ide/cmd640.c')
0 files changed, 0 insertions, 0 deletions