www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1de8644 543cf4c)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Jun 2008 10:26:59 +0000 (12:26 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Jun 2008 10:26:59 +0000 (12:26 +0200)
commit	f57aec5a871907427060196f6bac3d0011b38450
tree	fec11fec6cf8e2454e07bd04ac137cad85075611	tree \| snapshot
parent	1de8644cc7c826e0c41e52825bd5a12e2e31e6ca	commit \| diff
parent	543cf4cb3fe6f6cae3651ba918b9c56200b257d0	commit \| diff

Merge branch 'linus' into sched/devel

Conflicts:

kernel/sched_rt.c

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

Unnamed repository; edit this file 'description' to name the repository.