]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hwspinlock/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 06:09:59 +0000 (17:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 06:09:59 +0000 (17:09 +1100)
commit3e1ec2c3bd6ccd3eb89c3a8309f02811c4c43cf8
tree2c06e0a088b484b34dffa251df9cc31e017304ff
parentb84a814258734a5230659f7d082b691ed15f6ef9
parent8b37fcfc9b3400b647748783a2cafff67793e0ad
Merge remote-tracking branch 'hwspinlock/linux-next'

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