diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:02:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:02:36 +0200 |
| commit | 059eab45637b23c661bb00514950e7a449d04b4b (patch) | |
| tree | 03885f02b340559e777d81b965017d183c3ee6e6 /include/rdma/rdma_cm_ib.h | |
| parent | 94a2597c01a4bd495789e1546374c26b19f6eafd (diff) | |
| parent | 6ca44acfc31ad485b18e2fca0428479b7d4f141d (diff) | |
| download | talos-op-linux-059eab45637b23c661bb00514950e7a449d04b4b.tar.gz talos-op-linux-059eab45637b23c661bb00514950e7a449d04b4b.zip | |
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo <shawn.guo@linaro.org>:
* 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6: (26 commits)
ARM: dts: imx28-evk: add flexan devices
ARM: mx23: Add initial support for olinuxino board
ARM: dts: mx23: add gpmi nand support
ARM: dts: mxs: add lcd support for imx23-evk and imx28-evk
ARM: dts: mxs: add pwm-backlight for imx23-evk and imx28-evk
ARM: dts: mxs: enable rtc for imx23 and imx28
ARM: dts: imx28-evk: add heartbeat gpio-leds
ARM: dts: imx28-evk: add missing properties for fec
ARM: dts: imx28-evk: add vmmc-supply for mmc device
ARM: dts: imx23-evk: add auart device
ARM: dts: imx23-evk: updates for mmc device
ARM: dts: mxs: add hog-gpios for imx23-evk and imx28-evk
ARM: dts: mxs: add comments for pinmux-ids
ARM: mxs: use auxdata to attach mxsfb_platform_data
video: mxsfb: add simple device tree probe
video: mxsfb: move mxsfb.h into include/linux
rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
ARM: mxs: enable flexcan on imx28
ARM: dts: cfa10036: Add Power LED to the CFA-10036 board
ARM: mxs: Add Crystalfontz CFA-10036 DTS
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/rdma/rdma_cm_ib.h')
0 files changed, 0 insertions, 0 deletions
