diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 20:26:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 20:26:42 -0800 |
commit | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (patch) | |
tree | c7e17f739b121f5db12608117b757065e08a23f0 /include/media/soc_camera.h | |
parent | 635b3c9d5508d1dfe02ee5f882becea37e294111 (diff) | |
parent | a81406b4143ff07e586bbe03c50f089da94eefe1 (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:
drm/radeon/kms: rs600: use correct mask for SW interrupt
gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
drm/radeon/radeon_device.c: move a dereference below a NULL test
drm/radeon/radeon_fence.c: move a dereference below the NULL test
drm/radeon/radeon_connectors.c: add a NULL test before dereference
drm/radeon/kms: fix memory leak
drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
drm/edid: Fix CVT width/height decode
drm/edid: Skip empty CVT codepoints
drm: remove address mask param for drm_pci_alloc()
drm/radeon/kms: add missing breaks in i2c and ss lookups
drm/radeon/kms: add primary dac adj values table
drm/radeon/kms: fallback to default connector table
Diffstat (limited to 'include/media/soc_camera.h')
0 files changed, 0 insertions, 0 deletions