tree 7cbfec9c0012b07c7a236a953f5e067304725415
parent 3e2b32b69308e974cd1167beaf266d3c716e4734
parent 2e10c84b9cf0b2d269c5629048d8d6e35eaf6b2b
author Linus Torvalds <torvalds@g5.osdl.org> 1137264206 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1137264206 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6