nv-tegra.nvidia Code Review - linux-2.6.git/commit

]> nv-tegra.nvidia Code Review - linux-2.6.git/commit

Code Review / linux-2.6.git / commit

summary | shortlog | log | commit | commitdiff | review | tree
(merge: ab7e792 38cc1c3)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 22 Aug 2008 04:06:51 +0000 (06:06 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 22 Aug 2008 04:06:51 +0000 (06:06 +0200)
commit	8b53b57576292b92b27769f9e213df19b6e57786
tree	cd851ce4fa71b2653f120d7f11a9c6cbcf311b19	tree \| snapshot
parent	ab7e79243746e2a9c5f00243e60108189c44c9eb	commit \| diff
parent	38cc1c3df77c1bb739a4766788eb9fa49f16ffdf	commit \| diff

Merge branch 'x86/urgent' into x86/pat

Conflicts:
arch/x86/mm/pageattr.c

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

arch/x86/mm/pageattr-test.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat.c	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/agp.h	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/generic.c	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/intel-agp.c	diff1 \|	diff2 \|	blob \| history

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