Linus Torvalds fb7b096d94 Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) x86: Fix out of order of gsi x86: apic: Fix mismerge, add arch_probe_nr_irqs() again x86, irq: Keep chip_data in create_irq_nr and destroy_irq xen: Remove unnecessary arch specific xen irq functions. smp: Use nr_cpus= to set nr_cpu_ids early x86, irq: Remove arch_probe_nr_irqs sparseirq: Use radix_tree instead of ptrs array sparseirq: Change irq_desc_ptrs to static init: Move radix_tree_init() early irq: Remove unnecessary bootmem code x86: Add iMac9,1 to pci_reboot_dmi_table x86: Convert i8259_lock to raw_spinlock x86: Convert nmi_lock to raw_spinlock x86: Convert ioapic_lock and vector_lock to raw_spinlock x86: Avoid race condition in pci_enable_msix() x86: Fix SCI on IOAPIC != 0 x86, ia32_aout: do not kill argument mapping x86, irq: Move __setup_vector_irq() before the first irq enable in cpu online path x86, irq: Update the vector domain for legacy irqs handled by io-apic x86, irq: Don't block IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's ...		2010-03-03 08:15:37 -08:00
..
accessibility
acpi	Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-03 08:15:37 -08:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-03-01 13:04:58 -08:00
atm
auxdisplay
base	PM: Allow device drivers to use dpm_wait()	2010-02-26 20:39:11 +01:00
block	Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block	2010-03-01 09:00:29 -08:00
bluetooth	Bluetooth: Convert Marvell driver to use per adapter debugfs	2010-02-27 14:05:38 +01:00
cdrom	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
char	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2010-03-02 10:34:25 -08:00
clocksource	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-01 08:48:25 -08:00
connector
cpufreq
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2010-02-26 16:50:02 -08:00
dca
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
edac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-03-03 08:08:44 -08:00
firmware	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
gpio
gpu	Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:59:18 -08:00
hid	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00
hwmon
i2c	i2c: Document the message size limit	2010-03-02 12:23:49 +01:00
ide	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-03-01 10:36:22 -08:00
idle
ieee1394	block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors	2010-02-26 13:58:08 +01:00
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-03-03 07:33:17 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
leds
lguest
macintosh	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-03-01 10:38:09 -08:00
mca
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-03-03 08:08:44 -08:00
memstick	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-03-02 07:55:08 -08:00
mfd	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
misc
mmc	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
mtd	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-03-03 07:33:17 -08:00
nubus
of
oprofile
parisc
parport
pci	Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-03 08:15:05 -08:00
pcmcia	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2010-02-27 16:19:22 -08:00
platform	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86	2010-03-03 07:41:24 -08:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-03-02 07:55:08 -08:00
sbus
scsi	Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block	2010-03-01 09:00:29 -08:00
serial	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
sfi
sh
sn
spi	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
ssb	ssb: Add PCI ID 0x4322 to PHU handling	2010-02-19 15:52:51 -05:00
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-03-02 07:55:08 -08:00
tc
telephony
thermal
uio
usb	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
uwb
vhost	vhost-net: restart tx poll on sk_sndbuf full	2010-02-28 19:50:33 +02:00
video	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-03-02 10:41:26 -08:00
virtio	virtio: fix out of range array access	2010-02-28 20:39:11 +02:00
vlynq
w1
watchdog	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
xen	xen: Remove unnecessary arch specific xen irq functions.	2010-02-18 17:17:58 -08:00
zorro
Kconfig
Makefile