]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Apr 2010 14:55:35 +0000 (07:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Apr 2010 14:55:35 +0000 (07:55 -0700)
commit0ef145f3a1d3e98152d5ed76c029c4a6b81868fd
tree1975089f9faa51eb40f6680b3dd7394cd57b8eed
parent8490075a92d88227fa78e700a0998e526b3b509f
parent6760114b9c1b36c6cc357f0624d6a0f4eaf0a613
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: booke_wdt: fix build - unconstify watchdog_info
  watchdog: sbc_fitpc2_wdt: fixed "scheduling while atomic" bug.
  watchdog: sbc_fitpc2_wdt: fixed I/O operations order
  Watchdog: sb_wdog.c: Fix sibyte watchdog initialization