diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:33:19 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:33:19 +0800 |
| commit | 9ffbb68e899d0386196036a5e095ff724913f276 (patch) | |
| tree | da75b947e56f2a4f6ba36f3450c8788cdd2cc4d5 /firmware/Makefile | |
| parent | f4602255988c23ed729cb9e999c4caf2853142e6 (diff) | |
| parent | 23158c9927aeb6adbf6bae51cb6ec43e9e81f95c (diff) | |
Merge branch 'topic/lt-3.2-imx6-sata' into lt-3.2-imx6
* topic/lt-3.2-imx6-sata:
ARM: ahci: enable ahci sata on imx6q
Conflicts:
arch/arm/boot/dts/imx6q.dtsi
arch/arm/mach-imx/clock-imx6q.c
Diffstat (limited to 'firmware/Makefile')
0 files changed, 0 insertions, 0 deletions