diff options
author | 2014-05-07 09:06:21 +1000 | |
---|---|---|
committer | 2014-05-07 09:06:21 +1000 | |
commit | 2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc (patch) | |
tree | 090be55eb5cd2156b3b8228a0f0251fff330f74a /net/unix/af_unix.c | |
parent | Merge tag 'topc/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes (diff) | |
parent | drm/gm107/gr: bump attrib cb size quite a bit (diff) | |
download | wireguard-linux-2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc.tar.xz wireguard-linux-2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc.zip |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
nouveau fixes.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/gm107/gr: bump attrib cb size quite a bit
drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
drm/nouveau/bios: fix shadowing from PROM on big-endian systems
drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions