]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit046ac3f851ada39e4b930bd8b8f3ac0e7f2f7dca
tree123a4dd9f040d05e42cadb6b01f301d6863b897f
parentbdebd0a98c3fecee090a351e3065bf46f569f155
parent5cb4a77d9a0fdc7e8b592804b35f5500cd5c26bf
Merge master.kernel.org:/home/rmk/linux-2.6-arm

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