diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-06-21 15:03:05 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-06-21 15:03:05 +0800 |
| commit | d1276730560909329571ce75427e1c1dac43c9a0 (patch) | |
| tree | df724365ee32f8188f9fcdf1e9254cc90f18372a /Makefile | |
| parent | 19f043c9cee6ed78a051ecb244b3406bd21dd0b0 (diff) | |
| parent | 4e7e9e5834d6f8d9971bddfc7ddb91116226c39d (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android
Conflicts:
arch/arm/mach-mx6/devices-imx6q.h
drivers/power/sabresd_battery.c
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions