Fix merge error
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 6 Sep 2009 20:43:44 +0000 (20:43 +0000)
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 6 Sep 2009 20:43:44 +0000 (20:43 +0000)
commit6d20d4747e424104dd104871ce0eb51cc5c5f9b7
tree100f2ea8df26139b4819e38db8b5419828d1852c
parent9d1da6b4dc70f963433e871ff5027be97c4ca080
Fix merge error

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17534 3c298f89-4303-0410-b956-a3cf2f4a3e73
target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch