]> 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)
commit12df4426c730d9204efa2affa39608811bc17d84
tree3298e2c9a7c7db33bf28617875e5429e17eec61c
parent5f1141b63d71c49735ea872f8fb13d429bb92ded
parentcef1ea296333961543e36d56fdad05e0f55ca8fe
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