]> 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, 24 Aug 2012 00:19:41 +0000 (10:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 00:19:41 +0000 (10:19 +1000)
1  2 
arch/cris/Kconfig
arch/cris/arch-v32/drivers/pci/bios.c

Simple merge
Simple merge