diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-14 19:15:36 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-14 19:15:36 -1000 |
| commit | 9bb92855e3491e3f84a1477f14810f7c59fdbc73 (patch) | |
| tree | eb61cb5115803cb5a758a6152b83cf96a2206f21 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'usb-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | mei: me: clear interrupts on the resume path (diff) | |
| download | wireguard-linux-9bb92855e3491e3f84a1477f14810f7c59fdbc73.tar.xz wireguard-linux-9bb92855e3491e3f84a1477f14810f7c59fdbc73.zip | |
Merge tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc fixes from Greg Kroah-Hartman:
"Here are some small mei driver fixes for 3.10-rc6 that fix some
reported problems"
* tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
mei: me: clear interrupts on the resume path
mei: nfc: fix nfc device freeing
mei: init: Flush scheduled work before resetting the device
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions