diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-20 08:42:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-20 08:42:48 -0700 |
commit | 5cab3856e76f4e6dd44731cea054021105e3e02d (patch) | |
tree | 0fce18d11071276dac994765ffc35248438edab2 /drivers/net/mlx4/main.c | |
parent | 2edbdd1266784495979576c4ab4ef294c29bad27 (diff) | |
parent | 59de2bebabc5027f93df999d59cc65df591c3e6e (diff) |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
agp: zero pages before sending to userspace
drm: check for minor master before allowing drop master.
drm: set/clear is_master when master changed
drm: clean dirty memory after device release
drm: count reaches -1
Diffstat (limited to 'drivers/net/mlx4/main.c')
0 files changed, 0 insertions, 0 deletions