diff options
author | Arnd Bergmann <[email protected]> | 2013-03-15 15:31:20 +0100 |
---|---|---|
committer | Arnd Bergmann <[email protected]> | 2013-03-15 15:31:20 +0100 |
commit | c06e51db93a9fe018b58204125e08627011a8316 (patch) | |
tree | 550872b22535a55b06ffdbb2ebac4a551b6b541f /drivers/scsi/mpt2sas/mpi/mpi2_raid.h | |
parent | 8dda05ccd8a227e2b56ce6b26d52b1af88437f9e (diff) | |
parent | 5dc2eb7da1e387e31ce54f54af580c6a6f512ca6 (diff) |
Merge tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer <[email protected]>:
Two small ARM i.MX fixes for v3.9-rc
- Fix i.MX25 DT compilation
- Enable MAX clk on i.MX35
* tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: i.MX35: enable MAX clock
ARM: i.MX25: Fix DT compilation
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2_raid.h')
0 files changed, 0 insertions, 0 deletions