]> git.ozlabs.org Git - next-scripts/commitdiff
Merge commit 'effc2cae2d3f'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sat, 20 Jun 2015 02:14:45 +0000 (12:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sat, 20 Jun 2015 02:14:45 +0000 (12:14 +1000)
merge_akpm

index 255b767c7067f7264716aa17ed211638aa733ae5..f7670dbcf1a6594488905294705a14771ec6bd7d 100755 (executable)
@@ -83,6 +83,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
        bash -i || exit
 }
 echo "fix up?"
+notify-send "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd