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)
Conflicts:
vm_defconfig


Trivial merge