Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 23 Oct 2012 12:04:43 +0000 (16:04 +0400)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 23 Oct 2012 12:04:43 +0000 (16:04 +0400)
1  2 
driver/device_driver.c
driver/ec.c

Simple merge
diff --cc driver/ec.c
Simple merge