diff options
author | 2008-12-19 11:36:04 -0800 | |
---|---|---|
committer | 2008-12-19 11:36:04 -0800 | |
commit | f3485c82f75eeb951162dda663f45714627a85f5 (patch) | |
tree | 8ffbcdba50bbbecbf1beee698a515d3342b415ac /net/unix/af_unix.c | |
parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
parent | drm/i915: GEM on PAE has problems - disable it for now. (diff) | |
download | wireguard-linux-f3485c82f75eeb951162dda663f45714627a85f5.tar.xz wireguard-linux-f3485c82f75eeb951162dda663f45714627a85f5.zip |
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: GEM on PAE has problems - disable it for now.
drm/i915: Don't return busy for buffers left on the flushing list.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions