Linus Torvalds 5e152b4c9e 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: (27 commits) PCI: Don't use dmi_name_in_vendors in quirk PCI: remove unused AER functions PCI/sysfs: move bus cpuaffinity to class dev_attrs PCI: add rescan to /sys/.../pci_bus/.../ PCI: update bridge resources to get more big ranges when allocating space (again) KVM: Use pci_store/load_saved_state() around VM device usage PCI: Add interfaces to store and load the device saved state PCI: Track the size of each saved capability data area PCI/e1000e: Add and use pci_disable_link_state_locked() x86/PCI: derive pcibios_last_bus from ACPI MCFG PCI: add latency tolerance reporting enable/disable support PCI: add OBFF enable/disable support PCI: add ID-based ordering enable/disable support PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot. PCI: Set PCIE maxpayload for card during hotplug insertion PCI/ACPI: Report _OSC control mask returned on failure to get control x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs PCI: handle positive error codes PCI: check pci_vpd_pci22_wait() return PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio ... Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be44 moved the intel SMBUS ID definitons to the i2c-i801.c driver.		2011-05-23 15:39:34 -07:00
..
accessibility
acpi	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-05-23 15:39:34 -07:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-05-20 14:31:27 -07:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
bcma	bcma: pci: trivial: correct amount of maximum retries	2011-05-12 14:10:50 -04:00
block	Add appropriate <linux/prefetch.h> include for prefetch users	2011-05-22 21:41:57 -07:00
bluetooth	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm	2011-05-23 09:08:19 -07:00
clk
clocksource	clocksource: add common mmio clocksource	2011-05-23 18:04:51 +01:00
connector
cpufreq	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:55:12 -07:00
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2011-05-20 17:24:14 -07:00
dca
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
edac	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
eisa
firewire
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
gpio
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
hid	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
hwmon	hwmon: (coretemp) Fix compile error if CONFIG_SMP is not defined	2011-05-23 11:59:08 -07:00
hwspinlock
i2c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-05-23 15:39:34 -07:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6	2011-05-22 22:08:32 -07:00
idle
ieee802154
infiniband	Add appropriate <linux/prefetch.h> include for prefetch users	2011-05-22 21:41:57 -07:00
input	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
isdn	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
leds	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mca
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
memstick
message	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
mfd
misc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
mmc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
mtd	Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate	2011-05-23 18:05:10 +01:00
net	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-05-23 15:39:34 -07:00
nfc
nubus
of
oprofile
parisc
parport	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-05-23 15:39:34 -07:00
pcmcia
platform	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
pnp
power
pps
ps3
rapidio	rapidio: fix default routing initialization	2011-05-18 02:55:22 -07:00
regulator
rtc	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:45:08 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
sfi
sh
sn
spi	Haavard Skinnemoen has left Atmel	2011-05-18 23:24:50 +02:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
staging	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-05-23 12:49:28 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
tc
telephony
thermal
tty	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-05-23 12:23:20 -07:00
uio
usb	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
uwb
vhost
video	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-05-23 15:15:27 -07:00
virtio
vlynq
w1
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
zorro
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
Makefile	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00