]> git.baikalelectronics.ru Git - kernel.git/commit
Merge NetSilicon NS93xx tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 18 Feb 2007 11:27:07 +0000 (11:27 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 18 Feb 2007 11:27:07 +0000 (11:27 +0000)
commitbe6cacd27be285600b24d02109411f3ffc0015b7
treeb98d91de82a4a39a47c6031832271341ecf5e8e0
parentb80b765a77fb0418f247bd6f5312d996062136ad
parentfa7281ac2cf08bf7543d495200a96d45fcde834a
Merge NetSilicon NS93xx tree

Fixed conflicts:

arch/arm/Makefile
arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mm/Kconfig