git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e2de2e e479c60)
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)
1  2 
arch/arm/mach-ep93xx/core.c patch | diff1 | diff2 | blob | history
drivers/spi/spi-bfin5xx.c patch | diff1 | diff2 | blob | history
drivers/spi/spi-pl022.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-ep93xx/core.c
Simple merge
diff --cc drivers/spi/spi-bfin5xx.c
Simple merge
diff --cc drivers/spi/spi-pl022.c
Simple merge
Pandora Kernel Repository