diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-17 10:37:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-17 10:37:42 -0700 |
| commit | 7b4a51550981d7602a5e1209b53a67c817c85999 (patch) | |
| tree | 76fac7555cedc83716dd6d26ee8a260cef4ea322 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | 66eb411ea2d8d12eacc0eadcd5004a1736994814 (diff) | |
| parent | d969de8d83401683420638c8107dcfedb2146f37 (diff) | |
Merge tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial driver fixes from Greg KH:
"Here are two serial driver fixes for your tree. One is a revert of a
patch that causes a build error, the other is a fix to provide the
correct brace placement which resolves a bug where the driver was not
working properly"
* tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
serial: vt8500: add missing braces
Revert "serial: i.MX: evaluate linux,stdout-path property"
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions