pilppa.com Git - linux-2.6-omap-h63xx.git/commit

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: e56b3bc f934fb1)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 28 Jul 2008 21:32:00 +0000 (23:32 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 28 Jul 2008 21:32:00 +0000 (23:32 +0200)
commit	9e3ee1c39c0cc71222f9980ccbf87fe072897eef
tree	99462000e6f0d4f907cb2fc690f19d4d441ba0f3	tree \| snapshot
parent	e56b3bc7942982ac2589c942fb345e38bc7a341a	commit \| diff
parent	f934fb19ef34730263e6afc01e8ec27a8a71470f	commit \| diff

Merge branch 'linus' into cpus4096

Conflicts:

kernel/stop_machine.c

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

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