diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 18:24:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 18:24:06 -0700 |
| commit | 7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb (patch) | |
| tree | 23b2986db5c47a507039660091cd737506282b4a /drivers/net/wireless/hostap/hostap_ioctl.c | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| parent | drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge (diff) | |
| download | linux-rng-7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb.tar.xz linux-rng-7db2ccddd112d8b4b0d0dd7f309ebd8b39373fbb.zip | |
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: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge
drm/i915: cleanup FBC buffers at unload time
drm/i915: fix tiling limits for i915 class hw v2
drm/i915: set DIDL using the ACPI video output device _ADR method return.
drm/i915: Fix 82854 PCI ID, and treat it like other 85X
drm/i915: Attempt to fix watermark setup on 85x (v2)
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ioctl.c')
0 files changed, 0 insertions, 0 deletions