diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 00:41:15 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 00:41:15 -0500 |
| commit | aa71fa3cd5b7b4f669cd74c5a16de57d2938cd85 (patch) | |
| tree | d6dac4b9a73b7c3fc4a62bddfd8622e067cbdcdf /include/net/inet_hashtables.h | |
| parent | 79fa9eb7396238233c327668185d28bb47fb0796 (diff) | |
| parent | 3bfc7d22d0400e85a93e835d4398dcbe0af68b0b (diff) | |
Merge remote branch 'nouveau/for-airlied' into drm-next-stage
* nouveau/for-airlied: (25 commits)
drm/nouveau: use ALIGN instead of open coding it
drm/nouveau: report unknown connector state if lid closed
drm/nouveau: support version 0x20 displayport tables
drm/nouveau: Fix noaccel/nofbaccel option descriptions.
drm/nv50: Implement ctxprog/state generation.
drm/nouveau: use dcb connector types throughout the driver
drm/nv50: enable hpd on any connector we know the gpio line for
drm/nouveau: use dcb connector table for creating drm connectors
drm/nouveau: construct a connector table for cards that lack a real one
drm/nouveau: check for known dcb connector types
drm/nouveau: parse dcb gpio/connector tables after encoders
drm/nouveau: reorganise bios header, add dcb connector type enums
drm/nouveau: merge nvbios and nouveau_bios_info
drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table
drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_table
drm/nouveau: allow retrieval of vbios image from debugfs
drm/nouveau: fix missing spin_unlock in failure path
drm/nouveau: fix i2ctable bounds checking
drm/nouveau: fix nouveau_i2c_find bounds checking
drm/nouveau: fix pramdac_table range checking
...
Conflicts:
drivers/gpu/drm/nouveau/nouveau_gem.c
Diffstat (limited to 'include/net/inet_hashtables.h')
0 files changed, 0 insertions, 0 deletions