Merge branch 'bee-jpeg' into IVB-camera
authorWind Yuan <feng.yuan@intel.com>
Wed, 18 Jan 2012 12:33:00 +0000 (20:33 +0800)
committerWind Yuan <feng.yuan@intel.com>
Wed, 18 Jan 2012 12:33:00 +0000 (20:33 +0800)
commit5c1ab8d944cb9ae3ed08db8f0c0714c779819020
treef0e29988d6a7f16fa14fc5cd1f17906af13ae16f
parentcd2ec7fd7e6ce1396b3a154f0c5ec3f8d7ac038f
parent0ce962dfc363ad09aebfac0189c870503c46ceb6
Merge branch 'bee-jpeg' into IVB-camera