diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 10:57:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 10:57:59 -0800 |
| commit | 584ef2cd70acb0e473ba51e1073c2c5c95a2d27a (patch) | |
| tree | 8cbed7283567438fda8aea75a2ad4761acc6d826 /drivers/net/zorro8390.c | |
| parent | e1288cd72f54e7fc16ae9ebb4d0647537ef848d4 (diff) | |
| parent | 25b2ec5b643c9ea784e5a51e5e9602cd536965f2 (diff) | |
| download | linux-584ef2cd70acb0e473ba51e1073c2c5c95a2d27a.tar.bz2 | |
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/radeon/kms: balance asic_reset functions
drm/radeon/kms: remove duplicate card_posted() functions
drm/radeon/kms: add module option for pcie gen2
drm/radeon/kms: fix typo in evergreen safe reg
drm/nouveau: fix gpu page faults triggered by plymouthd
drm/nouveau: greatly simplify mm, killing some bugs in the process
drm/nvc0: enable protection of system-use-only structures in vm
drm/nv40: initialise 0x17xx on all chipsets that have it
drm/nv40: make detection of 0x4097-ful chipsets available everywhere
Diffstat (limited to 'drivers/net/zorro8390.c')
0 files changed, 0 insertions, 0 deletions