Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ... Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c Merge reason: we gathered a few conflicts plus update to latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-01 21:06:21 +02:00
..
accessibility
acpi	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
amba
ata	libata: Media rotation rate and form factor heuristics	2009-05-15 14:14:56 -04:00
atm
auxdisplay
base	Driver Core: do not oops when driver_unregister() is called for unregistered drivers	2009-05-28 14:24:07 -07:00
block	xen/blkfront: fix warning when deleting gendisk on unplug/shutdown	2009-05-19 08:27:42 +02:00
bluetooth
cdrom	cdrom: beyond ARRAY_SIZE of viocd_diskinfo	2009-05-20 08:42:06 +02:00
char	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
clocksource
connector
cpufreq	[CPUFREQ] fix timer teardown in ondemand governor	2009-05-26 12:04:50 -04:00
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-05-17 15:48:05 -07:00
dca
dio
dma	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-05-30 07:57:44 -07:00
edac	edac: AMD8111 & AMD8131 Kconfig fixup	2009-05-29 08:40:03 -07:00
eisa
firewire
firmware	ibft: fix the display of a few fields in the NIC attribute structure in sysfs	2009-05-02 15:36:10 -07:00
gpio
gpu	ACPI, i915: build fix (v2)	2009-05-29 21:26:38 -04:00
hid	HID: add NOGET quirk for devices from CH Products	2009-05-11 17:09:21 +02:00
hwmon	hwmon: (lm78) Add missing __devexit_p()	2009-06-01 13:46:49 +02:00
i2c	Merge branch 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux	2009-05-12 11:21:51 -07:00
ide	ide_pci_generic: add quirk for Netcell ATA RAID	2009-05-30 20:06:54 +02:00
idle	i7300_idle: allow testing on i5000-series hardware w/o re-compile	2009-05-28 20:52:40 -04:00
ieee1394
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2009-05-13 16:31:12 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-05-29 08:48:25 -07:00
isdn	gigaset: beyond ARRAY_SIZE of iwb->data	2009-05-21 15:04:15 -07:00
leds
lguest	lguest: fix on Intel when KVM loaded (unhandled trap 13)	2009-05-26 12:13:11 -07:00
macintosh
mca
md	md: raid5: change incorrect usage of 'min' macro to 'min_t'	2009-05-27 21:39:05 +10:00
media	V4L/DVB (11680): cafe_ccic: use = instead of == for setting a value at a var	2009-05-09 18:54:32 -03:00
memstick
message
mfd	mfd: pcf50633: fix unsafe disable_irq()	2009-05-19 22:22:28 +02:00
misc	[SCSI] ses: fix problems caused by empty SES provided name	2009-05-15 12:20:57 -04:00
mmc	[ARM] 5519/1: amba probe: pass "struct amba_id *" instead of void *	2009-05-20 23:26:51 +01:00
mtd	mtd: MXC NAND driver fixes (v5)	2009-05-29 10:44:05 +01:00
net	3c509: Add missing EISA IDs	2009-06-01 03:12:04 -07:00
nubus
of
oprofile	oprofile: fix cpu buffer size	2009-05-07 17:28:59 +02:00
parisc	irq: change ->set_affinity() to return status	2009-04-28 12:21:16 +02:00
parport	parport_gsc: fix printk format error	2009-05-29 08:40:02 -07:00
pci	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
pcmcia
platform	eeepc-laptop: unregister_rfkill_notifier on failure	2009-05-14 11:28:27 -04:00
pnp	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
power
ps3
rapidio
regulator	regulator: da903x: add missing __devexit_p()	2009-05-18 11:21:10 +01:00
rtc	[ARM] 5519/1: amba probe: pass "struct amba_id *" instead of void *	2009-05-20 23:26:51 +01:00
s390
sbus
scsi	[SCSI] mpt2sas: fix driver version inconsistency	2009-05-18 14:17:17 -05:00
serial	8250: Fix oops from setserial	2009-05-29 08:42:38 -07:00
sh
sn
spi	pxa2xx_spi: prevent panic case setup() fails	2009-05-12 14:11:34 -07:00
ssb
staging	Staging: comedi: David doesn't want to get comedi patches	2009-05-08 19:39:28 -07:00
tc
telephony
thermal	thermal: fix off-by-1 error in trip point trigger condition	2009-05-14 13:40:53 -04:00
uio
usb	Revert "USB: Correct Makefile to make isp1760 buildable"	2009-05-28 13:54:43 -07:00
uwb
video	atmel_lcdfb: correct fifo size for some products	2009-05-29 08:40:03 -07:00
virtio
w1
watchdog
xen	Merge branch 'x86/apic' into irq/numa	2009-05-12 12:17:36 +02:00
zorro
Kconfig
Makefile	V4L/DVB (11561a): move media after i2c	2009-04-29 15:41:13 -03:00