Eric Anholt 34dc4d4423 Merge remote branch 'origin/master' into drm-intel-next ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/radeon/r300.c The BSD ringbuffer support that is landing in this branch significantly conflicts with the Ironlake PIPE_CONTROL fix on master, and requires it to be tested successfully anyway.		2010-05-10 13:36:52 -07:00
..
accessibility
acpi
amba
ata	pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs	2010-05-05 14:48:48 -04:00
atm
auxdisplay
base
block	pktcdvd: improve BKL and compat_ioctl.c usage	2010-04-29 08:44:37 -07:00
bluetooth
cdrom
char	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
clocksource
connector
cpufreq	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2010-04-24 11:35:21 -07:00
cpuidle
crypto
dca
dio
dma	MIPS: TXx9: Add missing MODULE_ALIAS definitions for TXx9 platform devices	2010-04-30 20:52:40 +01:00
edac	edac, mce: Fix wrong mask and macro usage	2010-04-30 10:15:39 -07:00
eisa
firewire
firmware
gpio	Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6	2010-04-30 09:57:55 -07:00
gpu	Merge remote branch 'origin/master' into drm-intel-next	2010-05-10 13:36:52 -07:00
hid
hwmon	lis3: add support for HP ProBook 432x/442x/452x/522x	2010-04-24 11:31:24 -07:00
i2c	i2c-core: Use per-adapter userspace device lists	2010-05-04 11:09:28 +02:00
ide	pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs	2010-05-05 14:48:48 -04:00
idle
ieee1394
ieee802154
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-05 07:53:18 -07:00
isdn
leds
lguest
macintosh
mca
md
media
memstick
message
mfd
misc	VMware Balloon driver	2010-04-24 11:31:26 -07:00
mmc
mtd	[MTD] Remove zero-length files mtdbdi.c and internal.ho	2010-05-05 15:25:12 -04:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-05 07:55:07 -07:00
nubus
of	of: check for IS_ERR()	2010-04-28 01:07:29 -06:00
oprofile
parisc
parport
pci	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-04-29 17:16:36 -07:00
pcmcia	MIPS: DB1200: PCMCIA card detection must not be auto-enabled.	2010-04-30 20:52:43 +01:00
platform	eeepc-laptop: add missing sparse_keymap_free	2010-04-23 15:23:21 -04:00
pnp
power
pps
ps3
rapidio
regulator	regulator: fix enabling regulator issue on max8925	2010-04-28 15:24:34 +01:00
rtc
s390
sbus
scsi
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-04-30 10:16:42 -07:00
sfi
sh
sn
spi	omap2_mcspi: small fixes of output data format	2010-04-28 01:25:43 -06:00
ssb
staging	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2010-04-30 13:04:14 -07:00
tc
telephony
thermal
uio
usb	USB: sl811-hcd: Fix device disconnect	2010-04-30 09:25:12 -07:00
uwb
vhost
video	drivers/video/efifb.c: support framebuffer for NVIDIA 9400M in MacBook Pro 5,1	2010-04-24 11:31:24 -07:00
virtio
vlynq
w1	w1: fix omap 1-wire driver compilation	2010-04-24 11:31:25 -07:00
watchdog	watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.	2010-05-03 08:58:56 +00:00
xen
zorro
Kconfig
Makefile