| commit | 375d0c0e70cf788fa74c658e5dd619a7abb7c5f7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 15 10:21:07 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 15 10:21:07 2011 -0700 |
| tree | 07a53ae55261580137f5d9d69fc7d9c5365f3229 | |
| parent | da1b001a2a2a9cb323e58327ed07ac4a5e6d96ea [diff] | |
| parent | e3c1620434ac77b618ce74c024ace3559602ac99 [diff] |
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: add new NI pci ids