diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:23:30 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:23:30 +0800 |
| commit | 95df9608d81e4290a7a2657eef99229db2ec9aa6 (patch) | |
| tree | 5eff733607d8561d6744bfe9eb567e505b9b7cd4 /fs/logfs | |
| parent | 08998e8698a3b34826e2e36bffbe4bbdc6c5e581 (diff) | |
| parent | 0aea43bf004cabab7548668106bfe1376288a68c (diff) | |
Merge branch 'topic/lt-3.2-imx6-misc' into lt-3.2-imx6
* topic/lt-3.2-imx6-misc:
imx6q: add device tree support for OCOTP driver
imx6q: add support for OCOTP driver
imx6q: add support for watchdog using imx2_wdt.c
imx6q: add device tree support for IIM driver
imx6q: add support for virtual IIM driver
imx6q: add device tree support for SNVS RTC
imx6q: add support for SNVS RTC
Conflicts:
arch/arm/mach-imx/clock-imx6q.c
Diffstat (limited to 'fs/logfs')
0 files changed, 0 insertions, 0 deletions