Merge commit 'merge/htc-msm-2.6.27' into htc-msm-2.6.27
authorstachi <stachi@freetz-linux.fritz.box>
Fri, 12 Feb 2010 17:34:38 +0000 (18:34 +0100)
committerstachi <stachi@freetz-linux.fritz.box>
Fri, 12 Feb 2010 17:34:38 +0000 (18:34 +0100)
commiteb8d54d9d0bfd36db8b63730d83deb3fd8dd4119
tree60f9a0e8bd7ace23c652cc5bfbce636a05ab6d35
parentaa7b2a28f71e834be1cd9137cd914aeed3d3238c
parenta583ea40e4c56c94ce9fd33cfc1c70ccf149356b
Merge commit 'merge/htc-msm-2.6.27' into htc-msm-2.6.27
arch/arm/mach-msm/htc_battery_smem.c