]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit1b8c2dd9709aa96bd7b391edf978bf99216b42fb
tree48da95b4fa86c5e7d6d7e4272aa523514521848d
parentcc16ecde511b4e78dd183fda64a552fe109a8731
parentfb7d2ebd217a2a3cead4402b47c65c25881a2f75
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/telephony/Kconfig
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_sysfs.c