Linus Torvalds 7591103c08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (66 commits) ata: Add documentation for hard disk shock protection interface (v3) ide: Implement disk shock protection support (v4) ide-cd: fix printk format warning piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list ide-atapi: assign taskfile flags per device type ide-cd: move cdrom_info.dma to ide_drive_t.dma ide: add ide_drive_t.dma flag ide-cd: add a debug_mask module parameter ide-cd: convert driver to new ide debugging macro (v3) ide: move SFF DMA code to ide-dma-sff.c ide: cleanup ide-dma.c ide: cleanup ide_build_dmatable() ide: remove needless includes from ide-dma.c ide: switch to DMA-mapping API part #2 ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n ide: __ide_dma_end() -> ide_dma_end() pmac: remove needless pmac_ide_destroy_dmatable() wrapper pmac: remove superfluous pmif == NULL checks ide: Two fixes regarding memory allocation ...		2008-10-13 14:15:06 -07:00
..
accessibility	braille_console: only register notifiers when the braille console is used	2008-10-02 15:53:13 -07:00
acpi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-13 10:08:08 -07:00
amba
ata	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
auxdisplay
base	x86: memory corruption check - cleanup	2008-10-12 15:09:23 +02:00
block	Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-12 12:05:14 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
cdrom	gdrom: change to use __blk_end_request()	2008-10-09 08:56:21 +02:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
clocksource	clocksource, acpi_pm.c: fix check for monotonicity	2008-09-11 11:14:29 +02:00
connector
cpufreq	[CPUFREQ] Fix BUG: using smp_processor_id() in preemptible code	2008-10-09 13:52:44 -04:00
cpuidle
crypto	crypto: talitos - Avoid consecutive packets going out with same IV	2008-09-14 13:41:19 -07:00
dca
dio
dma	dw_dmac: fix copy/paste bug in tasklet	2008-10-03 18:22:18 -07:00
edac
eisa
firewire
firmware
gpio
gpu
hid
hwmon	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
i2c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6	2008-10-13 14:15:06 -07:00
ieee1394
infiniband	vfs: Use const for kernel parser table	2008-10-13 10:10:37 -07:00
input	Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-12 12:05:14 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
leds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
lguest
macintosh
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm	2008-10-10 11:11:47 -07:00
media	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2008-10-13 14:03:59 -07:00
memstick	memstick: change to use __blk_end_request()	2008-10-09 08:56:20 +02:00
message
mfd	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-10-11 10:09:45 -07:00
misc	eeepc-laptop: Fix hwmon interface	2008-10-09 15:33:57 +02:00
mmc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
mtd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
nubus
of
oprofile	Merge branch 'linus' into oprofile-v2	2008-10-13 11:05:51 +02:00
parisc
parport	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
pci	Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B	2008-10-11 20:17:36 +02:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
pnp	PnP: move pnpacpi/pnpbios_init to after PCI init	2008-10-10 08:00:17 -07:00
power	Fix Kconfig dependency for WM97xx battery driver	2008-10-12 12:37:16 -07:00
ps3
rapidio
regulator
rtc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-11 12:39:35 -07:00
s390	fs3270: Correct error returns	2008-10-13 09:51:44 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6	2008-10-13 14:15:06 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
sh
sn
spi	orion_spi: fix handling of default transfer speed	2008-10-03 18:22:18 -07:00
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
tc
telephony
thermal
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2008-10-13 14:12:40 -07:00
video	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
virtio
w1
watchdog	Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog	2008-10-12 11:51:32 -07:00
xen	xen: remove unused balloon.h	2008-10-03 10:04:10 +02:00
zorro
Kconfig
Makefile