[LinuxPPS] 24 Jun 18:23 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linuxpps: Linus Torvalds <>]

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"  
  
drivers/watchdog/Makefile

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=de08341a0ef747d607542af3ae441b286f503e35