git.openpandora.org
/
openembedded.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
effc276
dec3967
)
Merge remote branch 'origin/release-2010.12'
author
Khem Raj
<raj.khem@gmail.com>
Sat, 4 Dec 2010 03:42:03 +0000
(19:42 -0800)
committer
Khem Raj
<raj.khem@gmail.com>
Sat, 4 Dec 2010 03:42:03 +0000
(19:42 -0800)
Conflicts:
conf/distro/include/kaeilos-2009-preferred-versions.inc
recipes/busybox/busybox-1.18.0/B921600.patch
recipes/busybox/busybox-1.18.0/defconfig
recipes/busybox/busybox-1.18.0/fdisk_nios2.patch
recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch
recipes/busybox/busybox-1.18.0/udhcpscript.patch
recipes/linux/linux_2.6.36.bb
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Trivial merge
git.openpandora.org / openembedded.git / commitdiff