]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:07:21 +0000 (14:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:07:21 +0000 (14:07 +1100)
commitcad57877c8e30aadd1c6cf3c4da6440331fd0def
tree5ca66ae231d8bac67f36244a2bc6d972070268a6
parent3303976fd4f224c639fd561b202f24cd1c926386
parent1ed1b3df2e02b8f890e0f3b9d3dad0f39e3418a8
Merge remote-tracking branch 'staging/staging-next'
drivers/staging/dgrp/dgrp_net_ops.c
drivers/staging/dgrp/dgrp_sysfs.c