]> git.karo-electronics.de Git - mv-sheeva.git/commit
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1600f9d d8d8b63)
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)
commit696e65c3606aa3f587eeb181766baf49ea750cfc
tree1975089f9faa51eb40f6680b3dd7394cd57b8eedtree | snapshot
parent1600f9def09de07c5dbeb539e978fa73880690ddcommit | diff
parentd8d8b63b6dc413696ade040e52173c068df11702commit | 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: 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
Linux for Marvell Sheeva based platforms