linux-jlime-arm: fix mismerge
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Jul 2006 09:21:41 +0000 (09:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 09:21:41 +0000 (09:21 +0000)
commit0a5186fcb3682e80cb494ae758037a53da22a098
tree10ebb6b0ae94f734a6e972990a30c56cd359a48b
parent05b2a4e780989cc4ed9a7f41e0628cb6be89d63f
linux-jlime-arm: fix mismerge
packages/linux/linux-jlime-arm_2.6.17.bb