1. 30 Apr, 2008 26 commits
  2. 29 Apr, 2008 8 commits
  3. 30 Apr, 2008 3 commits
  4. 29 Apr, 2008 3 commits
    • Alex Chiang's avatar
      [IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id · fe086a7b
      Alex Chiang authored
      Legacy HP ia64 platforms currently cannot provide
      /proc/cpuinfo/physical_id due to legacy SAL/PAL implementations.
      However, that physical topology information can be obtained
      via ACPI.
      
      Provide an interface that gives ACPI one last chance to provide
      physical_id for these legacy platforms. This logic only comes
      into play iff:
      
      - ACPI actually provides slot information for the CPU
      - we lack a valid socket_id
      
      Otherwise, we don't do anything.
      
      Since x86 uses the ACPI processor driver as well, we provide a nop
      stub function for arch_fix_phys_package_id() in asm-x86/topology.h
      Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      fe086a7b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 2d5e3e8d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
        V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
        V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
        V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
        V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
        V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
        V4L/DVB (7782): pvrusb2: Driver is no longer experimental
        V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
        V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
        V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
        Rename common tuner Kconfig names to use the same
        Fix V4L/DVB core help messages
        V4L/DVB (7769): Move other terrestrial tuners to common/tuners
        V4L/DVB (7768): reorganize some DVB-S Kconfig items
        V4L/DVB(7767): Move tuners to common/tuners
        V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
        V4L/DVB (7765): Add support for Beholder BeholdTV H6
        V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
        V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
        V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
        V4L/DVB (7759): ivtv: increase version number to 1.2.1
        ...
      2d5e3e8d
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · b57ab763
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Convert most new-style drivers to use module aliasing
        i2c: Add support for device alias names
        i2c-amd756-s4882: Fix an error path
        i2c: Drop unused RTC driver IDs
        i2c/tps65010: Add missing intialization of client data
        i2c-sis5595: Minor cleanups in sis5595_access
        i2c-piix4: Minor cleanups
        i2c: Spelling fix (successful)
        i2c-stub: No newline in parameter description
      b57ab763