]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hwspinlock/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:44:05 +0000 (16:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:44:05 +0000 (16:44 +1100)
commit2a1e55dc8db5246859abdbd191f2fa496057cbbf
tree5da4f4e8f4a7047e417923a035c13557b504751b
parent5a0bc0b741f1017689299cfcf6e963e35ac58d41
parent8b37fcfc9b3400b647748783a2cafff67793e0ad
Merge remote-tracking branch 'hwspinlock/linux-next'

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