Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commit2e93960c4d712096902c16fe5511fc91502c2527
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2008 23:50:54 +0000 (6 15:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Nov 2008 23:50:54 +0000 (6 15:50 -0800)
treebcd3b72be70e8a5da5518e8212a54377ea39f874
parent71fe3fcaf67cec856650e12979b282428ed806a3
parentf0e625c1aa24e861c224fb778c377b2ddb443d2b
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:
  [WATCHDOG] SAM9 watchdog - supported on all SAM9 and CAP9 processors
  [WATCHDOG] SAM9 watchdog - update for moved headers