]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 02:54:45 +0000 (13:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 02:54:45 +0000 (13:54 +1100)
Conflicts:
drivers/staging/telephony/Kconfig

1  2 
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_sysfs.c

Simple merge
Simple merge