diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-13 11:41:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-13 11:41:26 -0700 |
| commit | 73cac03d0c771e56481017b8f093ae0300e89dad (patch) | |
| tree | e9c7dd3ab1f6a44728e4f95222b98bc22dee73a0 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | watchdog: sunxi: Fix section mismatch (diff) | |
| download | wireguard-linux-73cac03d0c771e56481017b8f093ae0300e89dad.tar.xz wireguard-linux-73cac03d0c771e56481017b8f093ae0300e89dad.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"This will fix a deadlock on the ts72xx_wdt driver, fix bitmasks in the
kempld_wdt driver and fix a section mismatch in the sunxi_wdt driver"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: sunxi: Fix section mismatch
watchdog: kempld_wdt: Fix bit mask definition
watchdog: ts72xx_wdt: locking bug in ioctl
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions