1. 20 Sep, 2009 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · e11c675e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (79 commits)
        USB serial: update the console driver
        usb-serial: straighten out serial_open
        usb-serial: add missing tests and debug lines
        usb-serial: rename subroutines
        usb-serial: fix termios initialization logic
        usb-serial: acquire references when a new tty is installed
        usb-serial: change logic of serial lookups
        usb-serial: put subroutines in logical order
        usb-serial: change referencing of port and serial structures
        tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
        tty: Char: mxser, add support for CP112UL
        uartlite: support shared interrupt lines
        tty: USB: serial/mct_u232, fix tty refcnt
        tty: riscom8, fix tty refcnt
        tty: riscom8, fix shutdown declaration
        TTY: fix typos
        tty: Power: fix suspend vt regression
        tty: vt: use printk_once
        tty: handle VT specific compat ioctls in vt driver
        n_tty: move echoctl check and clean up logic
        ...
      e11c675e
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-core-for-linus' of... · 467f9957
      Linus Torvalds authored
      Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (58 commits)
        perf_counter: Fix perf_copy_attr() pointer arithmetic
        perf utils: Use a define for the maximum length of a trace event
        perf: Add timechart help text and add timechart to "perf help"
        tracing, x86, cpuidle: Move the end point of a C state in the power tracer
        perf utils: Be consistent about minimum text size in the svghelper
        perf timechart: Add "perf timechart record"
        perf: Add the timechart tool
        perf: Add a SVG helper library file
        tracing, perf: Convert the power tracer into an event tracer
        perf: Add a sample_event type to the event_union
        perf: Allow perf utilities to have "callback" options without arguments
        perf: Store trace event name/id pairs in perf.data
        perf: Add a timestamp to fork events
        sched_clock: Make it NMI safe
        perf_counter: Fix up swcounter throttling
        x86, perf_counter, bts: Optimize BTS overflow handling
        perf sched: Add --input=file option to builtin-sched.c
        perf trace: Sample timestamp and cpu when using record flag
        perf tools: Increase MAX_EVENT_LENGTH
        perf tools: Fix memory leak in read_ftrace_printk()
        ...
      467f9957
  2. 19 Sep, 2009 38 commits