]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hwspinlock/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 08:05:25 +0000 (19:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 08:05:25 +0000 (19:05 +1100)
commit8276d4fdaa2441398461fdfc020a2ddb63fa41c6
treeac13f136f538a0413aaea639e0089f3d6259b585
parenta594c4b90ba18407b458c5d93462d4c961d089d3
parent8b37fcfc9b3400b647748783a2cafff67793e0ad
Merge remote-tracking branch 'hwspinlock/linux-next'

Conflicts:
arch/arm/mach-omap2/hwspinlock.c
MAINTAINERS
arch/arm/mach-omap2/hwspinlock.c