Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2008 18:23:35 +0000 (11:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2008 18:23:35 +0000 (11:23 -0700)
commitde08341a0ef747d607542af3ae441b286f503e35
tree97bdcb8323239800275ecc49bc2848e1e3d9037c
parent9bf8a943ad79a3bb15597fe0275f8b1cf26e2010
parent63842cccb285259345f52025ef57bdfd79657a2d
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"