Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:37:29 +0000 (08:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:37:29 +0000 (08:37 -0700)
commit4efb686205d5065f4e488e20fc858446b8ad7bb7
tree34502cd2ba57fa1418d66cf93d10d43c40c3f6f4
parent0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4
parentd0eb40628e29c2bb3b5f8242b1d2f50b1a88d9da
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  cdrom: update ioctl documentation
  ide: note that IDE generic may prevent other drivers from attaching
  ide-tape: fix vendor strings
  Swarm: Fix crash due to missing initialization