diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-15 14:24:32 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-15 14:24:32 +0400 |
| commit | 8229c885fe361e521ac64de36b16011e54a30de0 (patch) | |
| tree | 572e5d34b16713ddef9e803308c6f72014aff01b /crypto/krng.c | |
| parent | c3c50e8b651887bcefcc13beb3739c00b2379b5c (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | linux-8229c885fe361e521ac64de36b16011e54a30de0.tar.xz | |
drm: Merge tag 'v3.3-rc7' into drm-core-next
Merge the fixes so far into core-next, needed to test
intel driver.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'crypto/krng.c')
0 files changed, 0 insertions, 0 deletions