Merge branch 'htc-msm-2.6.27' of git://gitorious.org/linux-on-qualcomm-s-msm/linux...
authordrlucky <carsten@wilhelm-net.de>
Sat, 8 May 2010 14:46:29 +0000 (10:46 -0400)
committerdrlucky <carsten@wilhelm-net.de>
Sat, 8 May 2010 14:46:29 +0000 (10:46 -0400)
commit5114442589ffd3551c9d5af6cea8876d23f4c632
tree4c0e4389e47ece2738b54071fed4daba7e658e5a
parent2daef9f5215af51596630f308637acf243a40fbc
parentf2c4dc0e3c19fe73fd0210fb87f49c02858f34da
Merge branch 'htc-msm-2.6.27' of git://gitorious.org/linux-on-qualcomm-s-msm/linux-msm into htc-msm-2.6.27

Conflicts:

arch/arm/mach-msm/htc_headset.c
arch/arm/configs/htc_msm_android_defconfig
arch/arm/mach-msm/htc_headset.c
drivers/i2c/chips/microp-klt.c
include/linux/microp-klt.h