Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 18:43:26 +0000 (10:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 18:43:26 +0000 (10:43 -0800)

Trivial merge