1. 22 Jul, 2007 21 commits
  2. 21 Jul, 2007 16 commits
  3. 20 Jul, 2007 3 commits
    • David S. Miller's avatar
      [SPARC]: Fix serial console device detection. · c73fcc84
      David S. Miller authored
      The current scheme works on static interpretation of text names, which
      is wrong.
      
      The output-device setting, for example, must be resolved via an alias
      or similar to a full path name to the console device.
      
      Paths also contain an optional set of 'options', which starts with a
      colon at the end of the path.  The option area is used to specify
      which of two serial ports ('a' or 'b') the path refers to when a
      device node drives multiple ports.  'a' is assumed if the option
      specification is missing.
      
      This was caught by the UltraSPARC-T1 simulator.  The 'output-device'
      property was set to 'ttya' and we didn't pick upon the fact that this
      is an OBP alias set to '/virtual-devices/console'.  Instead we saw it
      as the first serial console device, instead of the hypervisor console.
      
      The infrastructure is now there to take advantage of this to resolve
      the console correctly even in multi-head situations in fbcon too.
      
      Thanks to Greg Onufer for the bug report.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c73fcc84
    • Linus Torvalds's avatar
      Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb · d6f410bd
      Linus Torvalds authored
      * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module
        V4L/DVB (5877): radio-gemtek-pci: remove unused structure member
        V4L/DVB (5871): Conexant 2388x: check for kthread_run
        V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next.
        V4L/DVB (5867): videodev2.h: add missing <sys/time.h> for userspace
        V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream
        V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies
        V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134
        V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers
        V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout
        V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers
        V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers
        V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage.
        V4L/DVB (5854): ivtv: cleanup of driver messages
        V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages.
        V4L/DVB (5852): ivtv: don't recompile needlessly
        V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option
        V4L/DVB (5850): ivtv: improve API command debugging
        V4L/DVB (5848): Av7110: fix typo
      d6f410bd
    • Linus Torvalds's avatar
      Un-ignore "vmlinux.lds.S" in .gitignore · eaf729c8
      Linus Torvalds authored
      We ignore all the generated files called "vmlinux*" from the top-level
      gitignore, but that also ends up catching a few files that we track, and
      that people do edit.  Notably the "vmlinux.lds.S" file, that each
      architecture has.
      
      You can always use "git add -f" to override the ignore file, but we
      might as well just make it explicit for this file.
      Bitten-by-and-tested-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      eaf729c8