Dan Williams bbb20089a3 Merge branch 'dmaengine' into async-tx-next ... Conflicts: crypto/async_tx/async_xor.c drivers/dma/ioat/dma_v2.h drivers/dma/ioat/pci.c drivers/md/raid5.c		2009-09-08 17:55:21 -07:00
..
accessibility
acpi	Merge branch 'bjorn-notify' into release	2009-06-24 01:22:20 -04:00
amba
ata	libata: don't set IORDY for reset	2009-06-23 01:54:30 -04:00
atm
auxdisplay
base	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
block	hd: stop defining MAJOR_NR	2009-06-18 09:56:20 +02:00
bluetooth	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
cdrom
char	Remove low_latency flag setting from nozomi and mxser drivers	2009-06-24 09:55:50 -07:00
clocksource	Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates' and 'sh/perf_counter'	2009-06-17 16:37:26 +09:00
connector	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
cpufreq	[CPUFREQ] Only set sampling_rate_max deprecated, sampling_rate_min is useful	2009-06-15 11:49:41 -04:00
cpuidle
crypto	crypto: padlock-aes - work around Nano CPU errata in CBC mode	2009-06-18 19:31:09 +08:00
dca
dio
dma	Merge branch 'dmaengine' into async-tx-next	2009-09-08 17:55:21 -07:00
edac	edac: Kconfig: fix the meaning of EDAC abbreviation	2009-06-18 13:03:57 -07:00
eisa	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-06-22 21:29:52 -07:00
firmware	Pull for-2.6.31 into release	2009-06-17 09:35:24 -07:00
gpio	gpio: driver for PrimeCell PL061 GPIO controller	2009-06-19 16:46:03 -07:00
gpu	Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release	2009-06-24 01:19:50 -04:00
hid	Driver Core: usb: add nodename support for usb drivers.	2009-06-15 21:30:25 -07:00
hwmon	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
i2c	i2c: driver for the Synopsys DesignWare I2C controller	2009-06-24 00:18:56 +01:00
ide	ide cmd64x: Remove serialize setting.	2009-06-21 22:48:03 -07:00
idle	ioat: switch watchdog and reset handler from workqueue to timer	2009-09-08 17:30:24 -07:00
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-06-22 21:29:52 -07:00
ieee802154	ieee802154: fix kconfig bool/tristate muckup	2009-06-13 23:36:29 -07:00
infiniband	Merge branches 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus	2009-06-23 10:38:47 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-06-20 10:17:02 -07:00
isdn	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
leds
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest	2009-06-12 09:32:26 -07:00
macintosh	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-06-16 11:29:17 -07:00
mca
md	Merge branch 'dmaengine' into async-tx-next	2009-09-08 17:55:21 -07:00
media	V4L/DVB (12131): BUGFIX: An incorrect Carrier Recovery Loop optimization table was being	2009-06-23 03:29:57 -03:00
memstick
message	fusion: mptsas, fix lock imbalance	2009-06-22 08:54:14 -05:00
mfd	[WATCHDOG] twl4030 watchdog driver	2009-06-20 18:39:43 +00:00
misc	gru: copyright fixes	2009-06-18 13:04:04 -07:00
mmc	dmaengine: Move all map_sg/unmap_sg for slave channel to its client	2009-09-08 17:53:05 -07:00
mtd	Merge git://git.infradead.org/mtd-2.6	2009-06-22 16:56:22 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-24 10:01:12 -07:00
nubus
of	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-15 09:40:05 -07:00
oprofile
parisc	parisc: remove driver_data direct access of struct device	2009-06-15 21:30:28 -07:00
parport	parport_pc: set properly the dma_mask for parport_pc device	2009-06-22 11:29:00 -07:00
pci	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-06-24 10:17:07 -07:00
pcmcia	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
platform	asus-laptop: remove EXPERIMENTAL dependency	2009-06-24 01:34:00 -04:00
pnp	Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release	2009-06-24 01:19:50 -04:00
power
pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
ps3	drivers/ps3: Add missing annotations	2009-06-15 16:47:25 +10:00
rapidio	rio: warn_unused_result warnings fix	2009-06-15 21:45:32 -05:00
regulator	regulator/max1586: fix V3 gain calculation integer overflow	2009-06-15 11:18:27 +01:00
rtc	rtc: make rtc_update_irq callable with irqs enabled	2009-06-19 16:46:05 -07:00
s390	[S390] dasd: fix refcounting in dasd_change_state	2009-06-22 12:08:23 +02:00
sbus	openprom: Squelch useless GCC warning.	2009-06-16 04:56:57 -07:00
scsi	[SCSI] scsi_transport_fc: replace BUS_ID_SIZE by fixed count	2009-06-21 12:11:43 -05:00
serial	pci: use pci_ioremap_bar() in drivers/serial	2009-06-24 09:55:50 -07:00
sh	sh: intc: alloc_bootmem() -> kzalloc() conversion.	2009-06-12 01:34:12 +03:00
sn
spi	spi_mpc8xxx: s/83xx/8xxx/g	2009-06-19 16:46:05 -07:00
ssb
staging	Staging: octeon-ethernet: Fix race freeing transmit buffers.	2009-06-24 18:34:41 +01:00
tc
telephony
thermal	thermal: remove driver_data direct access of struct device	2009-06-15 21:30:27 -07:00
uio
usb	Merge commit 'origin/master' into next	2009-06-18 11:16:55 +10:00
uwb
video	nvidiafb: fix boot-time printk string	2009-06-23 12:50:05 -07:00
virtio	virtio: enhance id_matching for virtio drivers	2009-06-12 22:16:40 +09:30
vlynq	drivers: add support for the TI VLYNQ bus	2009-06-16 19:47:52 -07:00
w1	Merge git://git.infradead.org/battery-2.6	2009-06-24 14:35:57 -07:00
watchdog	[WATCHDOG] wdt_pci.c: remove #ifdef CONFIG_WDT_501_PCI	2009-06-23 07:13:52 +00:00
xen	PM core: rename suspend and resume functions	2009-06-12 21:32:31 +02:00
zorro
Kconfig	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
Makefile	LinuxPPS: core support	2009-06-18 13:04:04 -07:00