diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-20 13:02:04 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-04-20 13:02:04 +0800 |
| commit | b0cf397cecdecc102b82fc844b7a9e098d841187 (patch) | |
| tree | 681e410089711d7e8d13cd819004e698fa6fec14 /drivers/regulator | |
| parent | eb1da050c08bb961a1e45dd51f97821d3eeb2ae9 (diff) | |
| parent | a7fbbad7276b41e8b338afafcaedf8c005de5c48 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15_12.04.01' into imx_3.0.15_android
Conflicts:
arch/arm/kernel/traps.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/mach-mx6/cpu.c
arch/arm/mach-mx6/system.c
Diffstat (limited to 'drivers/regulator')
0 files changed, 0 insertions, 0 deletions