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)
commit721d6d1ecc281541a7d89989779e02af09f13c13
tree85d0e22c19359df5fe1a50c74c9be1f9f46d4007
parent622e695886cfede6aea0ee8ba74e1b8a4c8c01e0
parent31776fbc66fef50cad30dc65404145d254646172
Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

* 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6:
  mx31moboard: Add watchdog support
  mx31moboard: update maintainer
arch/arm/mach-imx/Kconfig