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)
commit2dc94310bd94d0906febea7d0f7c188da620c952
tree6de4096f1887e2c00966177354b1c378e59bd632
parentc06015148fa9a3cc452ec7121b8c3f59f4a7d6ac
parentfb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6
Merge /linux/kernel/git/tmlind/linux-omap-upstream into devel
include/asm-arm/page.h