diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-13 09:33:24 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-13 09:33:24 +0400 |
| commit | e29402edf848359d619ce06af86d61e62c292c87 (patch) | |
| tree | 94451c1d400d478654e0d0e78564e882081b806c /drivers/nfc | |
| parent | bf98a6eaa9964fef49f186834713bfc57d16ede1 (diff) | |
| parent | 530f1d416091212243b341e0022b2967886b30e4 (diff) | |
| download | linux-e29402edf848359d619ce06af86d61e62c292c87.tar.xz | |
Merge branch 'mxs/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2
* 'mxs/dt/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6: (51 commits)
ARM: dts: enable audio support for imx28-evk
ARM: dts: enable i2c device for imx28-evk
i2c: mxs: add device tree probe support
ARM: dts: enable mmc for imx28-evk
ARM: dts: enable mmc for imx23-evk
mmc: mxs-mmc: add device tree support
mmc: mxs-mmc: copy wp_gpio in struct mxs_mmc_host
mmc: mxs-mmc: have dma_channel than dma_res in mxs_mmc_host
mmc: mxs-mmc: use devm_* helper to make cleanup simpler
mmc: mxs-mmc: move header from mach into linux folder
mmc: mxs-mmc: get rid of the use of cpu_is_xxx
mmc: mxs-mmc: let ssp_is_old take host as parameter
mmc: mxs-mmc: use global stmp_device functionality
ARM: mxs: add gpio support for device tree boot
gpio/mxs: add device tree probe
gpio/mxs: get rid of the use of cpu_is_xxx
gpio/mxs: use devm_* helpers to make error handling simple
ARM: mxs: add mxs-dma dt support
ARM: mxs: do not add dma device by default
dma: mxs-dma: add device tree probe support
...
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions