diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 12:44:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 12:44:15 -0700 |
| commit | c1c008cc55ab917923871db6bb461b903e9e1f76 (patch) | |
| tree | 4106f63211fed084e674bb69af0779eb5781039e /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | staging: comedi: bug-fix NULL pointer dereference on failed attach (diff) | |
| download | wireguard-linux-c1c008cc55ab917923871db6bb461b903e9e1f76.tar.xz wireguard-linux-c1c008cc55ab917923871db6bb461b903e9e1f76.zip | |
Merge tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two tiny staging tree fixes (well, one is for an iio driver,
but those updates come through the staging tree due to dependancies)
One fixes a problem with an IIO driver, and the other fixes a bug in
the comedi driver core"
* tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: comedi: bug-fix NULL pointer dereference on failed attach
iio: adjd_s311: Fix non-scan mode data read
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions