Merge remote-tracking branch 'remotes/common/tizen' into tizen
authorRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Mon, 29 Sep 2014 18:23:18 +0000 (11:23 -0700)
committerRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Mon, 29 Sep 2014 18:23:18 +0000 (11:23 -0700)
commit01e99346aa7c6d972cb69e5ce07443555d564cd5
tree998af69b54816eb41e1bb7042ff1e42065eef1b8
parentb0e57aeeda035a422177592b43101f8002a15b58
parentfe8f7d183a9611890bb14a795f8aa5f8aa61d13e
Merge remote-tracking branch 'remotes/common/tizen' into tizen

This update makes ivi be based on kernel-common tizen. The objective
is to leverage on the changes from kernel-common (e.g., unified
packaging) while preserving ivi-specific changes:

 * drm/i915 driver updates
 * kernel setting CAN bus bit-timing
.gitignore
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_crt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h