diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-15 21:28:52 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-15 21:38:04 -0400 |
| commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
| tree | 67510cec69e18e55d82bed803428b2a5027d92bb /net/ieee802154/dgram.c | |
| parent | 4ac073640a528662a7c072a30e92e70ce00ded33 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
Diffstat (limited to 'net/ieee802154/dgram.c')
0 files changed, 0 insertions, 0 deletions