]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 622e695 31776fb)
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 14:48:53 +0000 (14:48 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 14:48:53 +0000 (14:48 +0000)
* 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6:
  mx31moboard: Add watchdog support
  mx31moboard: update maintainer

1  2 
arch/arm/mach-imx/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-imx/Kconfig
Simple merge
Emulex OneConnect RDMA Driver