Merge branch 'features/imx31-moboard' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

Browse source

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

...

This commit is contained in:

Arnd Bergmann 2012-03-02 14:48:53 +00:00

parent 622e695886 31776fbc66

commit 721d6d1ecc

2 changed files with 4 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/mach-imx/Kconfig

View file

4

arch/arm/mach-imx/mach-mx31moboard.c

View file