diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-25 11:04:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-25 11:04:14 -0700 |
| commit | fd273d4415027f9b519d5a94e4fc030f278f2ad3 (patch) | |
| tree | 5c45f3b95817b82bff534e4b1f094c0147a23393 /drivers/ata | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
| parent | 435ca24116bc5365a10fa0be1bf1c1e4c5680157 (diff) | |
| download | blackbird-op-linux-fd273d4415027f9b519d5a94e4fc030f278f2ad3.tar.gz blackbird-op-linux-fd273d4415027f9b519d5a94e4fc030f278f2ad3.zip | |
Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
* tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX: Visstrim_M10: Add board version detection.
ARM: imx_v4_v5_defconfig: enable adc and touch driver of mc13783
ARM: i.MX: i.MX35-PDK: Add regulator support
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions
