1. 10 12月, 2012 3 次提交
    • A
      Merge remote-tracking branch 'kraxel/acpi.1' into staging · 8385b173
      Anthony Liguori 提交于
      * kraxel/acpi.1:
        acpi: drop debug port
        q35: update lpc pci config space according to configured devices
        apci: switch piix4 pci hotplug to memory api
        acpi: remove acpi_gpe_blk
        apci: switch piix4 gpe to memory api
        acpi: fix piix4 smbus mapping
        acpi: switch smbus to memory api
        acpi: cleanup ich9 memory region
        apci: switch ich9 smi to memory api
        apci: switch ich9 gpe to memory api
        acpi: cleanup vt82c686 memory region
        acpi: cleanup piix4 memory region
        apci: switch evt to memory api
        apci: switch cnt to memory api
        apci: switch timer to memory api
        apci: switch vt82c686 to memory api
        apci: switch ich9 to memory api
        apci: switch piix4 to memory api
      
      Conflicts:
      	hw/lpc_ich9.c
      
      Resolved merge conflict due to apm_init adding an argument.
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      8385b173
    • A
      Merge remote-tracking branch 'aneesh/for-upstream' into staging · 16ef55ca
      Anthony Liguori 提交于
      * aneesh/for-upstream:
        virtfs-proxy-helper: use setresuid and setresgid
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      16ef55ca
    • A
      Merge remote-tracking branch 'kraxel/usb.74' into staging · c62adbee
      Anthony Liguori 提交于
      * kraxel/usb.74:
        usb-tablet: Allow connecting to ehci
        ehci: Lower timer freq when the periodic schedule is idle
        usb: Allow overriding of usb_desc at the device level
        usb: Don't allow USB_RET_ASYNC for interrupt packets
        usb: Call wakeup when data becomes available for all devices with int eps
        add pc-1.4
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      c62adbee
  2. 09 12月, 2012 11 次提交
  3. 08 12月, 2012 11 次提交
  4. 06 12月, 2012 3 次提交
  5. 05 12月, 2012 3 次提交
  6. 04 12月, 2012 9 次提交