-
bk://bk.arm.linux.org.uk/linux-2.6-mmcLinus Torvalds authored
into ppc970.osdl.org:/home/torvalds/v2.6/linux Manual merge of arch/arm/Kconfig conflicts
865147c0
into ppc970.osdl.org:/home/torvalds/v2.6/linux Manual merge of arch/arm/Kconfig conflicts