]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/hexagon'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 01:26:07 +0000 (11:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 01:26:07 +0000 (11:26 +1000)
commit16cc62d14d31d3b8f922fdb9e82f945cadc93f61
treed9742aab8c8688352e8334e793dfa1c6a8ac36aa
parent5a6037b20f6780123cbcf39d6fbd0e40b3ada9ef
parent110b3723837f231b7dda418df975bcc09e780825
Merge branch 'quilt/hexagon'

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