Linus Torvalds d73b388459 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI/PM: Report wakeup events before resuming devices
  PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events
  PCI: sysfs: Update ROM to include default owner write access
  x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTAL
  x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available
  PCI/ACPI: Request _OSC control once for each root bridge (v3)
  PCI: enable pci=bfsort by default on future Dell systems
  PCI/PCIe: Clear Root PME Status bits early during system resume
  PCI: pci-stub: ignore zero-length id parameters
  x86/PCI: irq and pci_ids patch for Intel Patsburg
  PCI: Skip id checking if no id is passed
  PCI: fix __pci_device_probe kernel-doc warning
  PCI: make pci_restore_state return void
  PCI: Disable ASPM if BIOS asks us to
  PCI: Add mask bit definition for MSI-X table
  PCI: MSI: Move MSI-X entry definition to pci_regs.h

Fix up trivial conflicts in drivers/net/{skge.c,sky2.c} that had in the
meantime been converted to not use legacy PCI power management, and thus
no longer use pci_restore_state() at all (and that caused trivial
conflicts with the "make pci_restore_state return void" patch)
2011-01-14 09:29:05 -08:00
..
2010-12-21 02:16:10 -08:00
2011-01-11 14:03:09 -08:00
2011-01-11 14:03:08 -08:00
2010-12-21 02:16:10 -08:00
2010-12-21 02:16:10 -08:00
2010-12-31 11:11:38 -08:00
2010-12-21 02:16:10 -08:00
2010-12-21 02:16:08 -08:00
2010-12-21 02:16:08 -08:00
2010-12-21 02:16:08 -08:00
2010-11-09 09:17:56 -08:00
2010-12-21 02:16:08 -08:00
2010-06-03 03:18:23 -07:00
2010-11-17 12:21:14 -08:00
2010-11-09 09:17:56 -08:00
2010-07-11 18:15:08 -07:00
2010-12-21 02:16:08 -08:00
2010-11-09 09:17:56 -08:00
2010-12-01 11:11:31 -08:00
2010-08-24 12:24:07 -07:00
2010-09-26 18:34:29 -07:00
2010-12-31 11:04:02 -08:00
2010-11-28 10:47:19 -08:00
2010-12-23 11:44:34 -08:00
2010-12-23 11:44:34 -08:00
2010-07-19 13:32:57 -07:00
2010-07-14 13:40:36 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-09-29 13:23:30 -07:00
2010-09-26 18:34:29 -07:00
2010-12-21 02:16:08 -08:00
2010-12-21 02:16:08 -08:00
2010-09-26 18:34:29 -07:00
2010-11-28 11:16:38 -08:00
2010-11-16 11:39:08 -08:00
2011-01-09 15:42:56 -08:00
2011-01-09 15:42:56 -08:00
2010-09-26 18:34:29 -07:00
2010-12-21 02:16:08 -08:00
2011-01-03 12:43:10 -08:00
2010-11-18 10:45:24 -08:00
2010-12-21 02:16:08 -08:00
2010-10-21 03:52:11 -07:00
2010-07-27 22:24:37 -07:00
2010-11-08 13:50:06 -08:00
2010-11-09 09:17:56 -08:00
2010-11-09 09:17:56 -08:00
2010-09-26 18:34:29 -07:00
2010-12-16 14:43:14 -08:00
2010-09-26 18:34:29 -07:00
2010-06-21 13:40:25 -07:00
2010-07-05 20:08:05 -07:00
2010-12-21 02:16:08 -08:00
2010-12-21 02:16:08 -08:00
2010-06-28 12:41:33 -07:00
2010-09-26 18:34:29 -07:00
2010-09-15 22:06:05 -07:00
2010-09-21 18:04:47 -07:00
2010-12-12 22:08:17 -08:00
2010-07-15 20:46:22 -07:00
2010-12-11 11:46:36 -08:00
2010-11-01 15:38:34 -04:00
2011-01-09 15:54:15 -08:00
2011-01-09 15:54:15 -08:00
2010-10-24 16:25:39 -07:00
2010-09-26 18:34:29 -07:00
2010-12-21 02:16:08 -08:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-12-06 11:03:48 -08:00
2010-09-26 18:34:29 -07:00
2010-06-03 03:18:23 -07:00
2010-12-16 14:41:35 -08:00
2010-12-08 10:23:36 -08:00
2010-12-21 02:16:08 -08:00
2010-11-09 09:17:56 -08:00