]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb668da 3c9d8ec)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2010 22:20:15 +0000 (14:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2010 22:20:15 +0000 (14:20 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.