]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 27 Sep 2006 18:57:54 +0000 (19:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Sep 2006 18:57:54 +0000 (19:57 +0100)
1  2 
include/asm-arm/page.h

Simple merge