diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-07-09 10:48:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-07-09 10:48:41 +1000 |
| commit | fd0932d7f80146f115671a165461c6f877620abb (patch) | |
| tree | 29203180ce28a2409b52b44655b2b04908de0ce6 /drivers/net/ethernet/brocade/bna/bna.h | |
| parent | 30f83b371645e310c12087ece4eb255781036260 (diff) | |
| parent | d2989b534ef6834ebf2425aecc040b894b567c91 (diff) | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Two minor fixes for regressions.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/gr: fix gpc firmware regression
drm/nouveau: fix minor thinko causing bo moves to not be async on kepler
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bna.h')
0 files changed, 0 insertions, 0 deletions