]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 3 Apr 2012 00:25:56 +0000 (10:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 3 Apr 2012 00:25:56 +0000 (10:25 +1000)
commitdb3b6941dd7fa6b14f29a9954971605bbf17689e
tree4ca3c1e5ae05b237579a67a378a58a961e948540
parent7a771d131b9fe622e77c429b7eee7b137ca2eda7
parent110b3723837f231b7dda418df975bcc09e780825
Merge branch 'quilt/hexagon'

Conflicts:
arch/hexagon/Kconfig
arch/hexagon/Kconfig
arch/hexagon/kernel/ptrace.c
arch/hexagon/kernel/vdso.c