git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/stmmac/common.h

]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/stmmac/common.h

projects / mv-sheeva.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fe7de49 e53beac)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 18 Nov 2010 12:22:14 +0000 (13:22 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 18 Nov 2010 12:22:26 +0000 (13:22 +0100)
commit	92fd4d4d67b945c0766416284d4ab236b31542c4
tree	00b8b5f90748f752ccaba3dddbe271091d93543a	tree \| snapshot
parent	fe7de49f9d4e53f24ec9ef762a503f70b562341c	commit \| diff
parent	e53beacd23d9cb47590da6a7a7f6d417b941a994	commit \| diff

Merge commit 'v2.6.37-rc2' into sched/core

Merge reason: Move to a .37-rc base.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	diff1 \|	diff2 \|	blob \| history
kernel/watchdog.c	diff1 \|	diff2 \|	blob \| history

Linux for Marvell Sheeva based platforms