]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cris/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Nov 2011 00:35:36 +0000 (11:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Nov 2011 00:35:36 +0000 (11:35 +1100)
1  2 
arch/cris/arch-v32/drivers/cryptocop.c
drivers/net/cris/eth_v10.c

Simple merge