]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:24 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:24 +0000 (15:15 +0100)
commit518153abfab848a1c8070858b9d32b538129fac6
tree3298e2c9a7c7db33bf28617875e5429e17eec61c
parent8ad0194b04de93a3afc7ee4d9f2d982f6549907c
parent8b54ebd2444472bf0755ab38ccbef7913fdf5515
Merge branch 'misc' into for-linus

Conflicts:
arch/arm/kernel/ptrace.c
arch/arm/Kconfig
arch/arm/kernel/ptrace.c
arch/arm/kernel/signal.c
arch/arm/vfp/vfpmodule.c