merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 15 Sep 2007 18:46:39 +0000 (18:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 15 Sep 2007 18:46:39 +0000 (18:46 +0000)
commit76c075092edae2d22978580fc9c1cebdd4fefd1a
treeb5b1c8feae6269633a0b6dd6499ac9da442fa1bd
parent7d7fb07b49543bc0f34a25b2c9d543b9304bfd18
parent651a118bdabb0ee8f6838a7f87276e37c9ea60c2
Merge ... '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'
     and 'a3ee5d88f6d1100cd285c2fead8e37018bd42a9f'
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-ezx_2.6.21.bb