diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-10 10:55:35 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-10 10:55:35 +0100 |
| commit | eb84f976c88d72cbcbe756df38d1f19be3db77d6 (patch) | |
| tree | db3ff3b5edc305a0352b69327b914ef3a92e05a5 /kernel/kexec.c | |
| parent | 69f627f56fac212c1e49cd0d285e3f8cd264dd0c (diff) | |
| parent | cc7096fb6d1dfbdac5e7e2675c046fd40646cc66 (diff) | |
| download | talos-obmc-linux-eb84f976c88d72cbcbe756df38d1f19be3db77d6.tar.gz talos-obmc-linux-eb84f976c88d72cbcbe756df38d1f19be3db77d6.zip | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next so that I can keep merging patches. Specifically I
want:
- atomic stuff, yay!
- eld parsing patch from Jani.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'kernel/kexec.c')
0 files changed, 0 insertions, 0 deletions
