diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 00:09:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 00:09:05 +0200 |
| commit | 6c74700fdb8e3bc34c31790384a8ec16c4fefd97 (patch) | |
| tree | 824aa29b31e64e4cf0e67ce17ffd5d131fbc6138 /drivers/media/video/Kconfig | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | watchdog: hpwdt: formatting of pointers in printk() (diff) | |
| download | linux-6c74700fdb8e3bc34c31790384a8ec16c4fefd97.tar.xz linux-6c74700fdb8e3bc34c31790384a8ec16c4fefd97.zip | |
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
Diffstat (limited to 'drivers/media/video/Kconfig')
0 files changed, 0 insertions, 0 deletions