aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-02-18 00:06:38 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-02-18 00:08:20 +0400
commit4b16694bcea43445ed9cc4879464354a0a34636f (patch)
tree08ef3fddb99711a5df3ddd748859a09e964e3f6f /init
parent8393ea14076dbda27010fcabcff5e2d40f0bfb1f (diff)
Fix merge error in drivers/usb/host/ehci.hlinux-linaro-3.3-rc3-2012.02-1-android-0
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions