diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-12 21:18:00 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-12 21:18:00 (GMT) |
| commit | d1ca1a004822983e2fc702d5382b4b9a5527cfbe (patch) | |
| tree | ced77f6c6a5f98bb8d441030813d5e336dd24fa4 /include/net/ipx.h | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
| parent | a94919eaddaa3fede1df8563ce4d761a75374645 (diff) | |
| download | linux-fsl-qoriq-d1ca1a004822983e2fc702d5382b4b9a5527cfbe.tar.xz | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915/ringbuffer: Idling requires waiting for the ring to be empty
Revert "drm/i915: enable rc6 by default"
drm/i915: Clean up i915_driver_load failure path
drm/i915: Enable GPU reset on Ivybridge.
drm/i915/dp: manage sink power state if possible
drm/i915/dp: consolidate AUX retry code
drm/i915/dp: remove DPMS mode tracking from DP
drm/i915/dp: try to read receiver capabilities 3 times when detecting
drm/i915/dp: read more receiver capability bits on hotplug
drm/i915/dp: use DP DPCD defines when looking at DPCD values
drm/i915/dp: retry link status read 3 times on failure
Diffstat (limited to 'include/net/ipx.h')
0 files changed, 0 insertions, 0 deletions