diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 08:27:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 08:27:39 -0800 |
| commit | 21283f056fe10a022187a40c331100a1a9a90244 (patch) | |
| tree | 2b46c8428c5b97405a5ddfc6303f18ae383e4f08 /net/mac80211/rc80211_minstrel_debugfs.c | |
| parent | cdf0c7de29a87cc600ef367893523ea15938da4e (diff) | |
| parent | b60678a75d44fa9d5969f79781bd856ad5858609 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Disable the GM965 MSI errata workaround.
drm/i915: Don't return error in evict_everything when we get to the end.
drm/radeon: don't actually enable the IRQ regs until irq is enabled
Diffstat (limited to 'net/mac80211/rc80211_minstrel_debugfs.c')
0 files changed, 0 insertions, 0 deletions