]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/spi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:41:07 +0000 (14:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:41:07 +0000 (14:41 +1100)
commit3b8e214c284bfb8a335ff8b228d76b2b409ef0b2
tree3352bcc2344807f83495989bcc636deb45cc23f4
parentf679e72db514137e3d5ec0b3633cea56f1b43bd4
parent095c3752e673c0ba039a2f67fd867297fde75ae7
Merge remote-tracking branch 'spi/spi/next'

Conflicts:
drivers/spi/spi-s3c64xx.c
MAINTAINERS
drivers/spi/spi-ppc4xx.c
drivers/spi/spi-s3c64xx.c
drivers/spi/spi.c