commit 6c74700fdb8e3bc34c31790384a8ec16c4fefd97
author Linus Torvalds <torvalds@linux-foundation.org> Tue Aug 10 15:09:05 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Aug 10 15:09:05 2010 -0700
tree 824aa29b31e64e4cf0e67ce17ffd5d131fbc6138
parent 3e7561636f3f7f9b2942f6f90b021fdaeb0fe0ee
parent adb23631a739b6a02eadf0ee5ff021cadcddfc61

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: 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