commit | 0c3efe54d0165cecf0698b468e253577b555dde6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 07 13:34:41 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 07 13:34:41 2011 -0700 |
tree | e004169ae37bc1b9fdc636146bd6967061f6f78a | |
parent | 132452ee2368cf775ccbef9746b51e3d2ba58b85 [diff] | |
parent | d856b418464024dba4c7e901bab74dfb9a030d2e [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: mpc8xxx_wdt: fix build