]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 16:55:53 +0000 (08:55 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 16:55:53 +0000 (08:55 -0800)
1  2 
arch/arm/kernel/process.c

Simple merge