]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hwspinlock/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:50:41 +0000 (16:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:50:41 +0000 (16:50 +1100)
commit20d6aed307758fe9d57bfa96a17258ca283657e4
treea0ef19169118e969f6944e8206a6a157dad416ad
parent272acaf3d745ad7c2b2bf9c252a3b29c7c3a3024
parent8b37fcfc9b3400b647748783a2cafff67793e0ad
Merge remote-tracking branch 'hwspinlock/linux-next'

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