diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-23 17:22:16 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 18:27:32 +0000 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /net/unix/af_unix.c | |
| parent | drm/i915: Handle the no-interrupts case for UMS by polling (diff) | |
| parent | Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| download | wireguard-linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.tar.xz wireguard-linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.zip | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions