projects / scm / bb / meta-tizen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7716139 351485f)
Merge remote-tracking branch 'origin/tizen' into tizen-merged
authorPatrick Ohly <patrick.ohly@intel.com>
Wed, 4 Feb 2015 14:06:31 +0000 (06:06 -0800)
committerPatrick Ohly <patrick.ohly@intel.com>
Wed, 4 Feb 2015 14:06:31 +0000 (06:06 -0800)
commit0584a73fe042d1467a01668f165ff682c048199d
treee5f132d36ee6a845ce12c710dcefb56494b4c97btree | snapshot
parent771613955814bf076e173fa831a6e7a26b697b26commit | diff
parent351485f331a0cbf60049e89ac1c6c23425d3ba4ecommit | diff
Merge remote-tracking branch 'origin/tizen' into tizen-merged

Conflicts:
meta-tizen-adaptation/meta/recipes-kernel/linux/linux-yocto/i586/defconfig
meta-tizen-adaptation/meta/recipes-kernel/linux/linux-yocto/x86-64/defconfig

Conflict came from cherry-picking the 32 bit config fix and then updating the
defconfigs. Should have merged the 32 bit config fix in the first place to
avoid this.

Change-Id: I871118edcce6f9de59cbdbf60b134e2595be5292
Domain: SCM / BB;