]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 00:42:40 +0000 (10:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 00:42:40 +0000 (10:42 +1000)
commit136ae6641557ea8edb4e87bcb198f1b47534ed7c
tree30bb925a678f475b55645ff61859b595d9a1b308
parent945e710d2fa3516c6b5e7ad302d61729252d06f4
parent110b3723837f231b7dda418df975bcc09e780825
Merge branch 'quilt/hexagon'

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