]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:55:32 +0000 (13:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:55:32 +0000 (13:55 +1100)
commite60b0ab56a69fa910cbe9f4cfc3e80f42a8f7446
treeaad03eca6274d7ffb111b670b436726020f4872d
parentbd9dbaabb13a3fccd9da46eb8d415d2ef21667e1
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