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)
commit61b7efddc5256225099d13185659e9ad9d8abc8a
tree7cbfec9c0012b07c7a236a953f5e067304725415
parent3e2b32b69308e974cd1167beaf266d3c716e4734
parent2e10c84b9cf0b2d269c5629048d8d6e35eaf6b2b
Merge /pub/scm/linux/kernel/git/gregkh/spi-2.6