conflict in htc_headset.c resolved
authorChristof Raatz <vdelf@web.de>
Sat, 8 May 2010 17:03:38 +0000 (19:03 +0200)
committerChristof Raatz <vdelf@web.de>
Sat, 8 May 2010 17:03:38 +0000 (19:03 +0200)
commit6595a3047876530ac4a79bbd54a43ce425266e2b
tree84f644f8f3973ad4095195d9ccdeac8405ca74c3
parent5114442589ffd3551c9d5af6cea8876d23f4c632
conflict in htc_headset.c resolved
arch/arm/mach-msm/board-htckovsky.c
arch/arm/mach-msm/htc_headset.c