Merge branch 'upstream' 21/44221/1
authorHyejin Kim <hyejin0906.kim@samsung.com>
Mon, 20 Jul 2015 04:49:55 +0000 (13:49 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Mon, 20 Jul 2015 04:50:52 +0000 (13:50 +0900)
commit34f0321cc97943163134a3d3e223dc944cb24791
tree01a082ec64ee2f1184804b38dc8378bc44b3ff35
parent3a4d7d00f33c4967a90e3dd07210a8b7832a96bb
parentc353de2e55d0f64f4b11dbc242f8319674650c54
Merge branch 'upstream'

Change-Id: I17036143b5e644b1857e28b04d95fbd90fa2c112
lib/portability.c
packaging/config
toys.h
toys/other/netcat.c
toys/pending/hwclock.c
toys/pending/nsenter.c
toys/pending/telnetd.c