Linus Torvalds 8d97b84935 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ... * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits) [MIPS] Pb1000: bury the remnants of the PCI code [MIPS] Fix build failure in mips oprofile code [MIPS] fix warning message on SMP kernels [MIPS] markeins: build fix [MIPS] ELF handling - use SELFMAG instead of numeric constant [MIPS] Get rid of __ilog2 [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus [MIPS] XXS1500 code style cleanup [MIPS] MTX-1 code style cleanup [MIPS] Pb1200/DBAu1200 code style cleanup [MIPS] Pb1550 code style cleanup [MIPS] Pb1500 code style cleanup [MIPS] Pb1100 code style cleanup [MIPS] Pb1000 code style cleanup [MIPS] DBAu1xx0 code style cleanup [MIPS] Alchemy PCI code style cleanup [MIPS] Alchemy common code style cleanup [MIPS] Alchemy common headers style cleanup [MIPS] Add empty argument parenthesis to GCC_IMM_ASM [MIPS] msp_hwbutton.c: minor irq handler cleanups ...		2008-05-12 09:03:42 -07:00
..
accessibility	Kconfig: improved help for CONFIG_ACCESSIBILITY	2008-05-08 10:46:55 -07:00
acorn/char
acpi	Fix ACPI vs proc_create_data() mismerge	2008-04-30 16:26:27 -07:00
amba
ata	pata_atiixp: Don't disable	2008-05-06 11:43:44 -04:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-30 08:45:48 -07:00
auxdisplay
base	Fix bogus warning in sysdev_driver_register()	2008-05-06 13:22:42 -07:00
block	block: avoid duplicate calls to get_part() in disk stat code	2008-05-07 10:15:46 +02:00
bluetooth	hci_usb.h: fix hard-to-trigger race	2008-05-02 16:45:10 -07:00
cdrom	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-04-29 08:18:03 -07:00
char	vt: fix canonical input in UTF-8 mode	2008-05-08 10:46:56 -07:00
clocksource
connector
cpufreq	[CPUFREQ] state info wrong after resume	2008-04-28 16:27:08 -04:00
cpuidle
crypto
dca
dio
dma
edac	dev_name introduction fall out fix	2008-05-05 15:08:38 -07:00
eisa
firewire	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-05-02 13:52:35 -07:00
firmware	edd: add default mode CONFIG_EDD_OFF=n, override with edd={on,off}	2008-04-29 08:06:23 -07:00
gpio	gpio: pca953x: add support for pca9555 I2C I/O expander	2008-05-01 08:04:01 -07:00
hid	hid-core: use get_unaligned_* helpers	2008-04-29 08:06:27 -07:00
hwmon	Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6	2008-05-01 08:28:26 -07:00
i2c	[MIPS] Alchemy: SMBus resource fix	2008-05-12 16:46:50 +01:00
ide	m68k: Fix falconide `data_adr' typo	2008-05-05 12:36:34 -07:00
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2008-05-01 11:31:38 -07:00
infiniband	IB/ehca: Wait for async events to finish before destroying QP	2008-05-07 11:35:06 -07:00
input	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2008-05-09 08:07:58 -07:00
isdn	isdn: hysdn_procconf.c build fix	2008-05-01 08:03:59 -07:00
leds	Remove duplicated unlikely() in IS_ERR()	2008-04-29 08:06:25 -07:00
lguest	lguest: make Launcher see device status updates	2008-05-02 21:50:54 +10:00
macintosh	[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex	2008-05-05 16:47:13 +10:00
mca	proc: remove proc_root from drivers	2008-04-29 08:06:18 -07:00
md	misc: fix integer as NULL pointer warnings	2008-05-08 10:46:55 -07:00
media	i2c: Convert some more new-style drivers to use module aliasing	2008-05-11 20:37:06 +02:00
memstick
message	Remove duplicated unlikely() in IS_ERR()	2008-04-29 08:06:25 -07:00
mfd	drivers: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:53 -07:00
misc	kgdb: 1000 loops for the single step test in kgdbts	2008-05-05 07:13:21 -05:00
mmc	[ARM] 5024/1: Fix some minor clk issues in the MMCI PL18x driver	2008-05-04 11:06:05 +01:00
mtd	mtd: solutionengine flash map depends on solution engine mach group.	2008-05-08 19:51:40 +09:00
net	strip: Fix termios assumption	2008-05-12 07:27:38 -07:00
nubus	proc: convert /proc/bus/nubus to seq_file interface	2008-04-29 08:06:19 -07:00
of	[POWERPC] drivers/of/of_i2c.c: Add MODULE_LICENSE	2008-04-24 20:58:01 +10:00
oprofile	oprofile: change cpu_buffer from array to per_cpu variable	2008-04-28 08:58:31 -07:00
parisc	parisc: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
parport	debugobjects: add timer specific object debugging code	2008-04-30 08:29:53 -07:00
pci	x86/pci: remove flag in pci_cfg_space_size_ext	2008-04-29 15:34:05 -07:00
pcmcia	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
pnp	PNP: fix printk format warnings	2008-05-01 08:04:00 -07:00
power	Merge git://git.infradead.org/battery-2.6	2008-05-03 10:57:57 -07:00
ps3	[POWERPC] PS3: Remove unsupported wakeup sources	2008-05-02 15:00:44 +10:00
rapidio	[RAPIDIO] Auto-probe the RapidIO system size	2008-04-29 19:40:28 +10:00
rtc	i2c: Match dummy devices by type	2008-05-11 20:37:06 +02:00
s390	[S390] tty3270: fix put_char fail/success conversion.	2008-05-07 09:23:02 +02:00
sbus	sbus: Fix bpp driver build.	2008-05-05 00:33:58 -07:00
scsi	drivers/scsi/dpt_i2o.c: fix build on alpha	2008-05-08 10:46:56 -07:00
serial	cris: Fix compile failure due to typo in serial driver	2008-05-12 07:27:38 -07:00
sh
sn
spi	spi_s3c24xx signedness fix	2008-05-01 08:04:01 -07:00
ssb	ssb: Fix all-ones boardflags	2008-04-23 21:25:35 -04:00
tc
telephony
thermal	thermal: re-name thermal.c to thermal_sys.c	2008-04-29 03:12:17 -04:00
uio
usb	Fix c67x00-ll-hpi compilation failure (bug #10627)	2008-05-12 07:30:36 -07:00
video	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-05-11 09:55:48 -07:00
virtio	virtio: explicit advertisement of driver features	2008-05-02 21:50:50 +10:00
w1	drivers: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:53 -07:00
watchdog
xen	xen: add balloon driver	2008-04-24 23:57:33 +02:00
zorro	zorro: use non-racy method for proc entries creation	2008-04-29 08:06:21 -07:00
Kconfig	Basic braille screen reader support	2008-04-30 08:29:52 -07:00
Makefile	Basic braille screen reader support	2008-04-30 08:29:52 -07:00