From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 14 Jan 2006 18:43:26 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=61b7efddc5256225099d13185659e9ad9d8abc8a;p=deliverable%2Flinux.git

Merge /pub/scm/linux/kernel/git/gregkh/spi-2.6
---

61b7efddc5256225099d13185659e9ad9d8abc8a