]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'remoteproc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:24:11 +0000 (12:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:24:11 +0000 (12:24 +1000)
commitd3a3102336b5ae2db839e86bc368ef7973e6915d
tree758f34733a1b28e1cf64451fa24ad87a156a1753
parente1412f92cde9b30d861710685e65e62f85dac333
parent6bb697b6b06041d2d0affc862b17b4b443a107e0
Merge remote-tracking branch 'remoteproc/for-next'

Conflicts:
drivers/remoteproc/remoteproc_core.c
MAINTAINERS
drivers/remoteproc/omap_remoteproc.c
drivers/remoteproc/remoteproc_core.c
drivers/rpmsg/virtio_rpmsg_bus.c