diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 14:48:53 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 14:48:53 +0000 |
| commit | 721d6d1ecc281541a7d89989779e02af09f13c13 (patch) | |
| tree | 85d0e22c19359df5fe1a50c74c9be1f9f46d4007 /net/llc | |
| parent | 622e695886cfede6aea0ee8ba74e1b8a4c8c01e0 (diff) | |
| parent | 31776fbc66fef50cad30dc65404145d254646172 (diff) | |
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
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions