1. 08 Aug, 2008 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 3d8cd0c5
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
      3d8cd0c5
    • Stephen Rothwell's avatar
      powerpc/iseries: remove the old viocons driver · 4c514a5a
      Stephen Rothwell authored
      This driver was declared obsolete over 2 years ago, the alternative
      console driver for legacy iSeries (hvc_iseries) was made the default
      over 1 year ago and this driver has been build broken for over 3
      months, so remove it.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4c514a5a
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb · b80b601f
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits)
        V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers.
        V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams
        V4L/DVB (8611): Add suspend/resume to pxa_camera driver
        V4L/DVB (8610): Add suspend/resume capabilities to soc_camera.
        V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity.
        V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4
        V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1
        V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash.
        V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519.
        V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro
        V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x.
        V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508.
        V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation.
        V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.
        V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source.
        V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup.
        V4L/DVB (8564): fix vino driver build error
        V4L/DVB (8563): fix drivers/media/video/arv.c compilation
        V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select
        V4L/DVB (8558): media/video/Kconfig: fix a typo
        ...
      b80b601f
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · a06dee41
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03
        hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07
        hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus
        hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle
        hwmon: ad7414 driver
        hwmon: (thmc50) Add support for critical temperature limits
        hwmon: (adm9240) Remove EXPERIMENTAL dependency
        hwmon: (w83627hf) Drop reset module parameter
        hwmon: (w83627hf) Add pwm_enable sysfs interface
        hwmon: (w83791d) Use fan divisor bits from vbat register
        hwmon: (f71882fg) Delete needless forward declarations
        hwmon: (dme1737) Add support for the SMSC SCH5027
        hwmon: (dme1737) Skip detection if forced
        hwmon: (dme1737) Cleanups
      a06dee41
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · b588e2bb
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits)
        [WATCHDOG] more coding style clean-up's
        [WATCHDOG] sbc8360.c - move stop code into a function
        [WATCHDOG] Coding style - Indentation - part 2
        [WATCHDOG] Coding style - Indentation - part 1
        [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs
        [WATCHDOG] mpc8xxx_wdt: fix build
        [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
        [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
        [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs
        [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver
        [WATCHDOG] pcwd: a couple of watchdogs escaped conversion
        [WATCHDOG] Clean-up includes
        [WATCHDOG] hpwdt.c - fix double includes
        [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl
        [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl
        [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style
        [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl
        [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl
        [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl
        [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl
        ...
      b588e2bb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 3df302ff
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kbuild: a better way to generate cscope database change
        Kconfig: Extend "menuconfig" for modules to simplify Kconfig file
        bugfix for scripts/patch-kernel in 2.6 sublevel stepping
        kbuild: fix O=.. build with arm
      3df302ff
  2. 07 Aug, 2008 3 commits
  3. 06 Aug, 2008 31 commits