From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 22:09:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: upstream/snapshot3+hdmi~13506
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c74700fdb8e3bc34c31790384a8ec16c4fefd97;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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: hpwdt: formatting of pointers in printk()
  watchdog: Adding support for ARM Primecell SP805 Watchdog
  watchdog: f71808e_wdt: new watchdog driver for Fintek F71808E and F71882FG
  watchdog: sch311x_wdt.c: set parent before registeriing the misc device in probe() function
  watchdog: wdt_pci.c: move ids to pci_ids.h
  watchdog: s3c2410_wdt - Fix removing of platform device
---

6c74700fdb8e3bc34c31790384a8ec16c4fefd97