tree 208550c6ccecb8f1b4f85edb91702ca2bdef855e
parent f9d629c737cb6687216a0c540b5466a4bd8b070a
parent cb655d0f3d57c23db51b981648e452988c0223f9
author Grant Likely <grant.likely@secretlab.ca> 1286941082 -0600
committer Grant Likely <grant.likely@secretlab.ca> 1286941082 -0600

Merge commit 'v2.6.36-rc7' into spi/next