From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 18 Nov 2005 23:58:38 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: firefly_0821_release~39904
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b286e39207237e2f6929959372bf66d9a8d05a82;p=firefly-linux-kernel-4.4.55.git

Merge /pub/scm/linux/kernel/git/bart/ide-2.6
---

b286e39207237e2f6929959372bf66d9a8d05a82