]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 00:00:04 +0000 (11:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 00:00:04 +0000 (11:00 +1100)
commita48f5a4e948a4064230c23ee5c05b354a6ee62e3
treebbd45ddd10d3aec442a888365fded09464f79cf4
parent4f1f11f9461c0dfe42b65328a0862322416b2e79
parentcf9a53fb7cf8dd2fd2b5d7bb07434bd2ebeb5a8f
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/mm/idmap.c
arch/arm/mm/ioremap.c