Merge remote-tracking branch 'cris/for-next'
commitb529cf67bfedc4d77a7a762dd1e1ae727619e7c4
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Aug 2011 01:14:38 +0000 (25 11:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Aug 2011 01:14:38 +0000 (25 11:14 +1000)
tree7125a34a6e8520b8a88aeaa7d879f6cf522cde17
parentabbf0d1efa952e4c74f42620438a4302c3a34571
parentea78f5b898555ddfbab494c7755130362fe3cf46
Merge remote-tracking branch 'cris/for-next'
arch/cris/arch-v32/drivers/cryptocop.c
drivers/net/cris/eth_v10.c