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)
commitcaa8d2f9dc05542a2ab0f507a9cb0589b3f1f156
tree27682b41f54cbe504eac6bf5d7f35f49ae279faa
parent1941a86b15aecdcb72060ee1ff8ebaaa482473d6
Fix merge error

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