tree 83ac8a15b6e25569c34f53fd1d246968a2d536ca
parent 0034102808e0dbbf3a2394b82b1bb40b5778de9e
parent 1a77b127ae147f5827043a9896d7f4cb248b402e
author Grant Likely <grant.likely@secretlab.ca> 1334088592 -0600
committer Grant Likely <grant.likely@secretlab.ca> 1334088596 -0600

Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next