Fix merge error
authorMichael Büsch <mb@bu3sch.de>
Sun, 6 Sep 2009 20:43:44 +0000 (20:43 +0000)
committerMichael Büsch <mb@bu3sch.de>
Sun, 6 Sep 2009 20:43:44 +0000 (20:43 +0000)
commit438e437e0524601ee39d19461ac4ba4b3178e89f
tree100f2ea8df26139b4819e38db8b5419828d1852c
parent2b368772d47fef4369886e89dc2e270c739fcf20
Fix merge error

SVN-Revision: 17534
target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch