tree 08ef3fddb99711a5df3ddd748859a09e964e3f6f
parent 8393ea14076dbda27010fcabcff5e2d40f0bfb1f
author Andrey Konovalov <andrey.konovalov@linaro.org> 1329509198 +0400
committer Andrey Konovalov <andrey.konovalov@linaro.org> 1329509300 +0400

Fix merge error in drivers/usb/host/ehci.h

Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>