diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-17 05:03:42 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-17 05:04:39 +0200 |
| commit | a73403d85ab43ca633e393bb130add337d69fadb (patch) | |
| tree | cce9d968bc915bc974f18ca0f4f05d6331288e7b /kernel/trace/trace_nop.c | |
| parent | Merge tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | serial/8250: Limit the omap workarounds to omap1 (diff) | |
| download | linux-a73403d85ab43ca633e393bb130add337d69fadb.tar.xz linux-a73403d85ab43ca633e393bb130add337d69fadb.zip | |
Merge branch 'depends/tty-omap-serial' into next/cleanup
This part of the tty tree (unfortunately with all the preceding patches
as well) is a dependency for some of the OMAP cleanups, so we've pulled
it in as a dependency based on agreement with Greg.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'kernel/trace/trace_nop.c')
0 files changed, 0 insertions, 0 deletions