projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcd6c92 b97b662)
Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorGrant Likely <[email protected]>
Mon, 30 Jan 2012 15:32:37 +0000 (08:32 -0700)
committerGrant Likely <[email protected]>
Mon, 30 Jan 2012 15:32:37 +0000 (08:32 -0700)
Conflicts:
drivers/spi/spi-s3c64xx.c

1  2 
drivers/spi/spi-s3c64xx.c patch | diff1 | diff2 | blob | history

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge
John Crispins staging tree