David Woodhouse 751851af7a Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: sound/pci/Kconfig		2008-07-14 15:51:11 -07:00
..
accessibility	Kconfig: improved help for CONFIG_ACCESSIBILITY	2008-05-08 10:46:55 -07:00
acorn/char
acpi	x86, VisWS: turn into generic arch, eliminate Kconfig specials	2008-07-10 18:55:47 +02:00
amba
ata	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
atm	firmware: convert Ambassador ATM driver to request_firmware()	2008-07-10 14:49:39 +01:00
auxdisplay	Miguel Ojeda has moved	2008-07-04 10:40:05 -07:00
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
bluetooth	bluetooth: treat firmware data as const	2008-07-10 14:25:59 +01:00
cdrom	cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of buffers on stack)	2008-07-04 09:52:14 +02:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
clocksource
connector	CONNECTOR: add a proc entry to list connectors	2008-06-27 20:03:24 -07:00
cpufreq	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2008-06-09 11:27:55 -07:00
cpuidle	cpuidle acpi driver: fix oops on AC<->DC	2008-06-11 19:13:45 -04:00
crypto	crypto: ixp4xx - Select CRYPTO_AUTHENC	2008-07-13 20:12:11 +08:00
dca
dio
dma	iop-adma: fixup some kzalloc/memset confusions	2008-05-20 13:51:20 -07:00
edac	edac: mpc85xx: fix building as a module	2008-05-24 09:56:13 -07:00
eisa
firewire	firewire: fw-sbp2: fix parsing of logical unit directories	2008-06-27 20:55:00 +02:00
firmware	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
gpio	gpio: pca953x (i2c) handles max7310 too	2008-07-04 10:40:06 -07:00
gpu	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00
hid	HID: remove CVS keywords	2008-05-20 16:44:43 +02:00
hwmon	hdaps: add support for various newer Lenovo thinkpads	2008-07-04 10:40:06 -07:00
i2c	I2C: S3C2410: Add MODULE_ALIAS() for s3c2440 device.	2008-07-01 14:30:38 +01:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
ieee1394	ieee1394: Kconfig menu touch-up	2008-06-19 00:12:36 +02:00
infiniband	RDMA/cxgb3: Fix regression caused by class_device -> device conversion	2008-07-08 14:40:05 -07:00
input	Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel	2008-07-08 09:16:56 +02:00
isdn	drivers/isdn/i4l/isdn_common.c fix small resource leak	2008-07-12 14:33:41 -07:00
leds	LEDS: fix race in device_create	2008-05-20 13:31:55 -07:00
lguest	x86, VisWS: turn into generic arch, eliminate Kconfig specials	2008-07-10 18:55:47 +02:00
macintosh	[POWERPC] Build fix for drivers/macintosh/mediabay.c	2008-06-16 15:00:47 +10:00
mca
md	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2008-07-14 13:15:14 -07:00
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
memstick
message	[SCSI] fusion: default MSI to disabled for SPI and FC controllers	2008-07-12 08:18:11 -05:00
mfd	HTC_EGPIO is ARM-only	2008-05-21 16:56:00 -07:00
misc	atmel_pwm: Rename the "mck" clock to "pwm_clk"	2008-06-27 15:32:30 +02:00
mmc	pxamci: fix byte aligned DMA transfers	2008-07-06 10:37:40 -07:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
nubus
of	rtc-ds1374: rename device to just "ds1374"	2008-06-06 11:29:10 -07:00
oprofile	oprofile: don't request cache line alignment for cpu_buffer	2008-05-14 19:11:12 -07:00
parisc	drivers/parisc: replace remaining __FUNCTION__ occurrences	2008-05-15 10:38:54 -04:00
parport
pci	x86, VisWS: turn into generic arch, add early init quirks	2008-07-10 18:55:32 +02:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-07-14 13:24:39 -07:00
pnp	PNPACPI: use _CRS IRQ descriptor length for _SRS	2008-06-11 19:13:46 -04:00
power	power_supply: Fix race in power_supply_uevent	2008-06-10 02:13:51 +04:00
ps3
rapidio	rapidio: fix device reference counting	2008-07-10 18:04:43 -07:00
rtc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2008-07-14 13:37:29 -07:00
s390	[S390] sclp_tty: Fix scheduling while atomic bug.	2008-07-14 10:02:25 +02:00
sbus	sbus bpp: instances missed in s/dev_name/bpp_dev_name/	2008-05-21 16:55:59 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2008-07-14 13:37:29 -07:00
sh
sn
spi	spi: fix the read path in spidev	2008-07-04 10:40:08 -07:00
ssb	ssb-pcicore: Fix IRQ-vector init on embedded devices	2008-07-07 15:31:40 -04:00
tc
telephony
thermal	thermal: Create CONFIG_THERMAL_HWMON=n	2008-06-25 19:25:42 -04:00
uio	UIO: fix race in device_create	2008-05-20 13:31:55 -07:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
video	Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-14 13:43:24 -07:00
virtio	virtio: Complete feature negotation before updating status	2008-06-15 13:46:16 -07:00
w1
watchdog	Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"	2008-06-24 13:09:26 +00:00
xen	Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-14 13:43:24 -07:00
zorro
Kconfig
Makefile	drm: reorganise drm tree to be more future proof.	2008-07-14 10:45:01 +10:00