]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/video/omap/Makefile
Merge branch 'highmem' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 28 Nov 2008 15:39:02 +0000 (15:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 28 Nov 2008 15:39:02 +0000 (15:39 +0000)
commit7ef4de17cc55a3c3b8d093743b1e3b845d8eba47
treeadf87c996affbb6c42850d55cb34c0e5a2f6d340
parentf412b09f4ed7c57f5b8935ed7d6fc786f402a629
parentb5ee9002583fc14e6d45a04c18f208987a8fbced
Merge branch 'highmem' into devel

Conflicts:

arch/arm/mach-clps7500/include/mach/memory.h
arch/arm/include/asm/page.h
arch/arm/kernel/setup.c
arch/arm/mm/mmu.c
drivers/usb/gadget/pxa25x_udc.c