Merge branch 'bee-jpeg' into IVB-camera
authorWind Yuan <feng.yuan@intel.com>
Thu, 19 Jan 2012 17:08:33 +0000 (01:08 +0800)
committerWind Yuan <feng.yuan@intel.com>
Thu, 19 Jan 2012 17:08:33 +0000 (01:08 +0800)
commit855c3ab1ee7f5fc8779a3be88367f4d2abfb68e7
tree3bda4c026e38959b6284ddd4bb292e692006c51b
parentfa9398de666fe820381315397e0f68abf285b0d9
parente28c52b69aa164adc8aaef91ccbfcb8c157b5857
Merge branch 'bee-jpeg' into IVB-camera