7d299ad4020115b193858817e6c57e95db5 parent 9c0a788b4315b83f6138ffa15c56ccf541106e58 author Grant Likely 1287415509 -0600 committer Grant Likely 1287415509 -0600 Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin into spi/next