From: Linus Torvalds Date: Tue, 30 Jun 2009 03:07:43 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a4f13fad1ab5bd08dea78fc55321e429d83cddf;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide: memory overrun in ide_get_identity_ioctl() on big endian machines using ioctl HDIO_OBSOLETE_IDENTITY ide: fix resume for CONFIG_BLK_DEV_IDEACPI=y ide-cd: handle fragmented packet commands gracefully ide: always kill the whole request on error ide: fix ide_kill_rq() for special ide-{floppy,tape} driver requests --- 5a4f13fad1ab5bd08dea78fc55321e429d83cddf