Merge branch 'devel'
authorImran Zaman <imran.zaman@linux.intel.com>
Mon, 30 Jun 2014 12:38:58 +0000 (15:38 +0300)
committerImran Zaman <imran.zaman@linux.intel.com>
Mon, 30 Jun 2014 12:38:58 +0000 (15:38 +0300)
commit5f1f3eb2b247fc1beed22d590df77251b739ed67
tree5b38e140849366d36da223debdbef3dd527aed8b
parent9f43b3aae5494672492d1926cf236ba75f3f433c
parentc16cbfa6b1b3620b058817a168bf6ac9063d065a
Merge branch 'devel'