projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 823cd04 1ad849a)
Merge branch 'spi-fix' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Apr 2013 13:55:16 +0000 (14:55 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Apr 2013 13:55:16 +0000 (14:55 +0100)
1  2 
drivers/spi/spi-s3c64xx.c patch | diff1 | diff2 | blob | history
drivers/spi/spi.c patch | diff1 | diff2 | blob | history

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
Domain: SDK / Emulator;