Merge remote-tracking branch 'cris/for-next'
commit1b23d9109aa4a683b2b98a2b73763ffd33c404de
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 01:52:18 +0000 (24 11:52 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 01:52:18 +0000 (24 11:52 +1000)
treeb6145f3aa146f77bbaaac36bb8607d45adedd005
parent6788a6bacccd1d05fad087dccbdcaf876238e04b
parentea78f5b898555ddfbab494c7755130362fe3cf46
Merge remote-tracking branch 'cris/for-next'
arch/cris/arch-v32/drivers/cryptocop.c
drivers/net/cris/eth_v10.c