OSDN Git Service

Merge branch 'froyo-x86' into gingerbread-x86 gingerbread-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 20 Apr 2011 09:08:56 +0000 (17:08 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 20 Apr 2011 09:08:56 +0000 (17:08 +0800)
commit365b5e0fb030492650bff87e63921b4d342eeed6
tree4592f69ee979d29a65e00fc388642df52f471133
parent5ef3eda222a8457820de6d12dd9114e45b3bb9e6
parent11ba9d7878c68b3fe801b09e46119af971aada49
Merge branch 'froyo-x86' into gingerbread-x86

Conflicts:
vm_defconfig