diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-18 17:20:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-18 17:20:15 -0500 |
| commit | 24bc7347da73a9ed3383056c3d0f28c0e361621e (patch) | |
| tree | 486211383b2f6bded1c0f24fe72130d2f2ffb65d /drivers/ieee1394/iso.h | |
| parent | bb668da6d6f2bec8a63838c098d9515eccb22cc4 (diff) | |
| parent | 3c9d8eccd8687f0e770e4d89fd0d73d4f81a985a (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] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs
Diffstat (limited to 'drivers/ieee1394/iso.h')
0 files changed, 0 insertions, 0 deletions