Merge branch 'spi/merge' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 17 Jun 2011 14:32:26 +0000 (08:32 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 17 Jun 2011 14:32:26 +0000 (08:32 -0600)
commitf8db4cc4f2b11bdded6c94f0d55906847474b982
treed1b99d186edb9d203fafd896f19487125a2395af
parent2e2de2e314672c8b6644f67a35556d6df780493d
parente479c60456ef22b0869432887216186aabaed086
Merge branch 'spi/merge' into spi/next
arch/arm/mach-ep93xx/core.c
drivers/spi/spi-bfin5xx.c
drivers/spi/spi-pl022.c