From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Sep 2008 15:37:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4efb686205d5065f4e488e20fc858446b8ad7bb7;p=openwrt%2Fstaging%2Fblogic.git

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
---

4efb686205d5065f4e488e20fc858446b8ad7bb7