Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Jun 2009 03:07:43 +0000 (20:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Jun 2009 03:07:43 +0000 (20:07 -0700)
commit5a4f13fad1ab5bd08dea78fc55321e429d83cddf
tree4474bf39b945b5a672e940080b17bdcbc04e1d15
parentec9c45d456fd7f1e400c75e6c8040d1deb9d4fff
parente18ed145c7f556f1de8350c32739bf35b26df705
Merge git://git./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