]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 03:27:32 +0000 (14:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 03:27:32 +0000 (14:27 +1100)
commit4e2f8dc332cf336cd407ae916f82ec713f5e469c
tree09d1078e972292761eecf0ea610530f85874c218
parentb3031aa6d5faaa8637160aceb1d94c2e15239787
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