]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:01:44 +0000 (10:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:01:44 +0000 (10:01 +1000)
commit85834fc645bb8c16eb6e838d601cc03ff298ffb8
tree3f67de0fa81ce2bd08d796d91bc7ab776988e359
parent742ba91dc8931294fac09292093d8ae6de09aad6
parent110b3723837f231b7dda418df975bcc09e780825
Merge branch 'quilt/hexagon'

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