Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 23:20:40 +0000 (15:20 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 23:20:40 +0000 (15:20 -0800)
commitcce0cac125623f9b68f25dd1350f6d616220a8dd
tree123a4dd9f040d05e42cadb6b01f301d6863b897f
parentf564c5fe29d3fa9adc6d839714521b0554c62598
parent18f49ea207fbcf37f81395037f0dc1cacb2aac3c
Merge master.kernel.org:/home/rmk/linux-2.6-arm

Manual conflict merge of arch/arm/Kconfig
arch/arm/Kconfig