diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 21:59:57 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 21:59:57 +0200 |
commit | 112d17d6f75b93e1dcaec2e2232a411148b3bf71 (patch) | |
tree | 65a691d3ef47d5a0ba2a01b3d14c04b2adfd7291 | |
parent | ARM: CSR: add rtc i/o bridge interface for SiRFprimaII (diff) | |
parent | at91: at91-ohci: configure overcurrent pins as input GPIOs (diff) | |
parent | Merge branch 'imx/cleanup' into imx/devel (diff) | |
parent | ARM: davinci: AM18x: Add wl1271/wlan support (diff) | |
download | linux-112d17d6f75b93e1dcaec2e2232a411148b3bf71.tar.xz linux-112d17d6f75b93e1dcaec2e2232a411148b3bf71.zip |
Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next/devel