summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/qdio_main.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-07 21:59:57 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-07 21:59:57 +0200
commit112d17d6f75b93e1dcaec2e2232a411148b3bf71 (patch)
tree65a691d3ef47d5a0ba2a01b3d14c04b2adfd7291 /drivers/s390/cio/qdio_main.c
parentARM: CSR: add rtc i/o bridge interface for SiRFprimaII (diff)
parentat91: at91-ohci: configure overcurrent pins as input GPIOs (diff)
parentMerge branch 'imx/cleanup' into imx/devel (diff)
parentARM: davinci: AM18x: Add wl1271/wlan support (diff)
downloadlinux-112d17d6f75b93e1dcaec2e2232a411148b3bf71.tar.xz
linux-112d17d6f75b93e1dcaec2e2232a411148b3bf71.zip
Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next/devel