]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cris/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 01:42:42 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 01:42:42 +0000 (11:42 +1000)
1  2 
arch/cris/arch-v32/drivers/cryptocop.c
drivers/net/cris/eth_v10.c

Simple merge