tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21079 commits 1 branch 0 tags 215 MiB
Commit graph

499 commits

Author SHA1 Message Date
Elliott Hughes
a744b05984 Add missing <malloc.h> and <string.h> includes. 
Change-Id: Ia41756e607663d056e7d2fdd7ecbec7e5841a913
 2015-01-28 11:37:57 -08:00
Elliott Hughes
68a6f887e6 am ae79cb5a: Merge "Add missing <string.h> includes." 
* commit 'ae79cb5a819bd5bbd86a3496141d45c22db8c86b':
  Add missing <string.h> includes.
 2015-01-25 20:42:49 +00:00
Elliott Hughes
2b7d75d2e6 Add missing <string.h> includes. 
Change-Id: I3d1ad54418f69f947e2d829d63b53d44581bfd86
 2015-01-24 20:03:09 -08:00
Elliott Hughes
f8eac2ffc6 am ce34551c: Merge "Lose id to toybox." 
* commit 'ce34551ce6559fe97043a26e3df65396c91bdffc':
  Lose id to toybox.
 2015-01-17 03:50:05 +00:00
Elliott Hughes
1bf5054342 Lose id to toybox. 
Change-Id: I0b92482d06055207e133112e74c58964c7ef0362
 2015-01-16 19:24:26 -08:00
Elliott Hughes
f5a6c6bbb5 am 17e2f436: Merge "Lose cmp to toybox." 
* commit '17e2f436f0da70673498482921a642c8917677aa':
  Lose cmp to toybox.
 2015-01-15 23:55:45 +00:00
Elliott Hughes
b546991685 Lose cmp to toybox. 
Change-Id: Ib8b078565e4951f7621d21fbe3573bfcf2435879
 2015-01-15 14:59:22 -08:00
Elliott Hughes
d5c46b6370 am 3d7951d4: Merge "Lose chown to toybox." 
* commit '3d7951d4a43af35fc7d61a8a69fb2acf4bc50f1b':
  Lose chown to toybox.
 2015-01-15 22:58:23 +00:00
Elliott Hughes
6eb88b2c1d Lose chown to toybox. 
Change-Id: Ic56addb183ce7f1d289b807527047c37924c1aa6
 2015-01-15 13:47:00 -08:00
Elliott Hughes
776158fed3 am 41341eea: Merge "Lose date to toybox (as date and hwclock)." 
* commit '41341eea6b32b1c3012a976cfb75704007c39449':
  Lose date to toybox (as date and hwclock).
 2015-01-15 00:42:41 +00:00
Elliott Hughes
587e30c91c am 3bb5654a: Merge "Lose ifconfig to toybox." 
* commit '3bb5654a46f062b87f6bdbbf8b8945bc9e99947b':
  Lose ifconfig to toybox.
 2015-01-14 20:24:51 +00:00
Elliott Hughes
f8bf054fab Lose date to toybox (as date and hwclock). 
Change-Id: I7015454edd2240413d93509a96ad884592fcaae9
 2015-01-14 12:24:23 -08:00
Elliott Hughes
e5efa98207 am da3dec3c: Merge "Lose toolbox notify in favor of toybox inotifyd." 
* commit 'da3dec3c19d1489f5997aea9dafd34b68c2b515b':
  Lose toolbox notify in favor of toybox inotifyd.
 2015-01-14 19:14:12 +00:00
Elliott Hughes
f84994ba0d Lose ifconfig to toybox. 
Change-Id: Id3fd2898e137d3a70a3dc5ed65689ef5e029c8cd
 2015-01-14 11:05:05 -08:00
Elliott Hughes
c5d17fde1e am 4503a145: Merge "Switch to toybox cat." 
* commit '4503a1450ce9b2ed86fd9bd3eb3c34c845e8ed08':
  Switch to toybox cat.
 2015-01-14 18:56:07 +00:00
Elliott Hughes
30286c8467 Lose toolbox notify in favor of toybox inotifyd. 
Change-Id: I02e3849c0b944289c6541ff14f1e80a7f8041829
 2015-01-14 10:50:17 -08:00
Elliott Hughes
532bb72a84 Switch to toybox cat. 
Change-Id: I0bab6018010c71f6c17eb10bea20dceb470c5242
 2015-01-14 10:37:43 -08:00
Elliott Hughes
9c359a3dd2 am 69159ba0: Merge "Fix missing #includes in system/core." 
* commit '69159ba0b70178a24e6f592dfb9d903629c23a09':
  Fix missing #includes in system/core.
 2014-12-30 12:21:10 +00:00
Elliott Hughes
0badbd6565 Fix missing #includes in system/core. 
Change-Id: I4736e8c4f7bb8bb03640d26d58243efaa67dc75c
 2014-12-29 12:24:25 -08:00
Elliott Hughes
b01c52aac2 am d106305f: Merge "Lose getenforce and setenforce to toybox." 
* commit 'd106305f67b71653d4409a416c69796cbcc948e8':
  Lose getenforce and setenforce to toybox.
 2014-12-24 19:51:55 +00:00
Elliott Hughes
2e67705cff Lose getenforce and setenforce to toybox. 
Change-Id: Ie03161cc2d6ae410e079e1142e62e6836858c9db
 2014-12-24 11:31:14 -08:00
Elliott Hughes
4138f9df99 am dbe49757: Merge "Lose netstat to toybox." 
* commit 'dbe4975791a4592d863a1418eb68b84fd614937e':
  Lose netstat to toybox.
 2014-12-23 18:38:05 +00:00
Elliott Hughes
7e3879e467 Lose netstat to toybox. 
Change-Id: I165ff67fc47286b992f167ff7392246a805b6d68
 2014-12-23 09:13:33 -08:00
Elliott Hughes
9332f9c44d am 12677383: Merge "Lose mv to toybox." 
* commit '12677383ae247b26225cf9c961e3fb46bcdfc6a6':
  Lose mv to toybox.
 2014-12-17 04:26:43 +00:00
Elliott Hughes
a264cca35a Lose mv to toybox. 
Change-Id: Ibbba4d516d55460c6d627b766cc087e6a7edcabd
 2014-12-16 19:20:10 -08:00
Elliott Hughes
37dc409af8 am 300a85e5: Merge "Lose rm to toybox." 
* commit '300a85e5a786e7e59d847a4bcd927014337a60e2':
  Lose rm to toybox.
 2014-12-17 01:43:19 +00:00
Elliott Hughes
1d0c3fb751 am cc825ae7: Merge "Lose cp to toybox." 
* commit 'cc825ae79219f2b5d9fa768d50963ad2f43bbd11':
  Lose cp to toybox.
 2014-12-17 00:28:18 +00:00
Elliott Hughes
dc74ad2df8 am 700a9570: Merge "Lose ln to toybox." 
* commit '700a9570703bb2c0880c3ef5087925693daa3afc':
  Lose ln to toybox.
 2014-12-17 00:23:18 +00:00
Elliott Hughes
fdab0f5be5 Lose rm to toybox. 
Change-Id: I93904b85e180d4324b64e2e90a4832c4d4169627
 2014-12-16 16:22:54 -08:00
Elliott Hughes
b3fa82607c Lose cp to toybox. 
Change-Id: Idfe52737093d243ae2dcb054f686f6d6af0c2de6
 2014-12-16 16:15:32 -08:00
Elliott Hughes
4592237808 am a7e6dbd3: Merge "Lose rmdir to toybox." 
* commit 'a7e6dbd3c269e80a6e6959428e60e8639c48efea':
  Lose rmdir to toybox.
 2014-12-16 23:40:34 +00:00
Elliott Hughes
ae96efca51 Lose ln to toybox. 
I accidentally enabled the toybox ln in my original commit, so which ln
you've been running for the last few weeks has depended on which directory
you built more recently...

Change-Id: If73783477aa4eb4d058d6e170d6291ba0d9c5f40
 2014-12-16 15:38:04 -08:00
Elliott Hughes
9e69ee9185 am 8dc9777b: Merge "Lose mkdir to toybox." 
* commit '8dc9777b33fa073bcd6e1b52f7e9a117978e43f6':
  Lose mkdir to toybox.
 2014-12-16 23:37:01 +00:00
Elliott Hughes
ff60f7c94a Lose rmdir to toybox. 
Change-Id: I80ecc7c19bf7fc44039235c846727853d78a5d15
 2014-12-16 15:28:03 -08:00
Elliott Hughes
de4fd83e0b Lose mkdir to toybox. 
Change-Id: Ie2ad916893ba36e7cee6d5a4533e60732871c8dd
 2014-12-16 15:18:56 -08:00
Elliott Hughes
d57e0d5d7e am 8641daee: Merge "Lose chcon to toybox." 
* commit '8641daeea1c9990934562593828b85d8dceb5a04':
  Lose chcon to toybox.
 2014-12-16 20:35:04 +00:00
Elliott Hughes
2f5d6d3d1c Lose chcon to toybox. 
Change-Id: I9ae70ff53da6e31ccb1c4e127ce9349ab794f78f
 2014-12-16 09:18:50 -08:00
Elliott Hughes
f404c649a7 am ffe4d9cd: Merge "toybox has md5sum, so lose toolbox\'s md5." 
* commit 'ffe4d9cdc7e354cfa487223dd2bd5adb38869163':
  toybox has md5sum, so lose toolbox's md5.
 2014-12-12 03:19:50 +00:00
Elliott Hughes
014ab468f3 toybox has md5sum, so lose toolbox's md5. 
We've now removed enough that for the first time toolbox has
dipped below toybox in size:

  -rwxr-xr-x root     shell      230800 2014-12-11 18:55 toolbox
  -rwxr-xr-x root     shell      233632 2014-12-11 18:32 toybox

Change-Id: I6b150f195dd9f803ddce58a89aa7c23a5b930e5b
 2014-12-11 18:56:38 -08:00
Elliott Hughes
3e49bbc4c1 am efd482f5: Merge "Lose mknod to toybox." 
* commit 'efd482f5e41aaca30521f2cb20e4dcad731cc9f8':
  Lose mknod to toybox.
 2014-12-12 02:53:23 +00:00
Elliott Hughes
71cf21fe1f Lose mknod to toybox. 
Change-Id: Ib81efed6c06a776626a42c25508b15461e495288
 2014-12-11 18:33:46 -08:00
Elliott Hughes
4f5fddea23 am fc383879: Merge "Remove toolbox hd." 
* commit 'fc383879eb8a6ee940f56128d33ec9e59924d9ba':
  Remove toolbox hd.
 2014-12-12 00:40:31 +00:00
Elliott Hughes
c6251d8f46 Remove toolbox hd. 
No one runs this anyway; they get the slightly better one from mksh instead.

Change-Id: I5e629cb3b443d3d38206f11f365fe483936d5440
 2014-12-11 16:20:02 -08:00
Elliott Hughes
8313dddcb9 am 81784ae8: Merge "Lose chmod to toybox." 
* commit '81784ae8ddae139646441eb1dcaa5e1d89ab29de':
  Lose chmod to toybox.
 2014-12-11 21:07:37 +00:00
Elliott Hughes
98c80a0f40 Lose chmod to toybox. 
Change-Id: I358f1761238b48f2de94cc43716581d24c846edd
 2014-12-11 12:13:25 -08:00
Elliott Hughes
45765c74fc am e19e3fc7: Merge "Lose kill to toybox." 
* commit 'e19e3fc72d230809d75fff6d7b246a2cd2525029':
  Lose kill to toybox.
 2014-12-05 16:57:11 +00:00
Elliott Hughes
049ee390df Lose kill to toybox. 
Change-Id: Icca3eb4b78e07eb49b090cc98dc3ca3f5c5ea8a6
 2014-12-04 20:08:26 -08:00
Andreas Gampe
df8d6f6eeb am 7f55e82c: Merge "Toolbox: Disable unused-XXX warnings" 
* commit '7f55e82cd2673c89d7fc52e076b81f2379a75283':
  Toolbox: Disable unused-XXX warnings
 2014-12-05 03:38:15 +00:00
Andreas Gampe
7f55e82cd2 Merge "Toolbox: Disable unused-XXX warnings" 2014-12-05 03:23:41 +00:00
Andreas Gampe
e826877117 Toolbox: Disable unused-XXX warnings 
For build-system CFLAGS clean-up, disable warnings locally.

Should be reverted when the code is fixed.

Bug: 18632512
Change-Id: Ia373784ec36d37545a7e50db1df9f8cc37d7bf30
 2014-12-04 18:01:26 -08:00
Elliott Hughes
79991acbfc am ba037592: Merge "Lose vmstat to toybox." 
* commit 'ba03759264e62d5592688957cb70ffa567356074':
  Lose vmstat to toybox.
 2014-12-04 22:57:17 +00:00
Elliott Hughes
ba03759264 Merge "Lose vmstat to toybox." 2014-12-04 22:42:08 +00:00
Elliott Hughes
a03656d884 resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aosp 
Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
 2014-11-27 11:31:06 -08:00
Elliott Hughes
330d892782 am b553a18a: Merge "Lose dmesg to toybox." 
* commit 'b553a18a02cd90298716c88d9167f877b63a36b6':
  Lose dmesg to toybox.
 2014-11-27 12:01:22 +00:00
Elliott Hughes
0085d948f2 Lose readlink to toybox. 
Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
 2014-11-26 15:19:47 -08:00
Elliott Hughes
b553a18a02 Merge "Lose dmesg to toybox." 2014-11-26 19:37:30 +00:00
Elliott Hughes
a7ec5f1067 am 50ac7725: Merge "Lose nohup to toybox." 
* commit '50ac7725a5f1c195989888277341f22ab54f979b':
  Lose nohup to toybox.
 2014-11-26 02:03:41 +00:00
Elliott Hughes
38228a2c10 Lose vmstat to toybox. 
Change-Id: Ifcb64292bb147ad592d1a627bb8dbb684f4a27e4
 2014-11-25 17:17:17 -08:00
Elliott Hughes
402f7e97d5 Lose nohup to toybox. 
Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
 2014-11-25 16:58:53 -08:00
Elliott Hughes
8e8cd0cf7a Lose dmesg to toybox. 
Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
 2014-11-25 16:23:15 -08:00
Elliott Hughes
8e76610cfc am 077ff309: Merge "Lose mkswap, swapoff, and swapon to toybox." 
* commit '077ff30954275e635c5faa8b75afcd0a44a78dcc':
  Lose mkswap, swapoff, and swapon to toybox.
 2014-11-25 19:03:59 +00:00
Elliott Hughes
4d7a262c63 am 75afd633: Merge "Lose printenv to toybox." 
* commit '75afd63340b2a19ff85e5a577a8a0bdd1ca46d26':
  Lose printenv to toybox.
 2014-11-25 19:03:43 +00:00
Elliott Hughes
45f296ec48 am bcece29c: Merge "Lose sleep to toybox." 
* commit 'bcece29c4438c6b92c973d30bc8a46331f16369f':
  Lose sleep to toybox.
 2014-11-25 19:03:35 +00:00
Elliott Hughes
f2f0b0fa69 am e494c513: Merge "Lose sync to toybox." 
* commit 'e494c513f919b405f92d3a3ebefa105a2482ec5b':
  Lose sync to toybox.
 2014-11-25 19:03:25 +00:00
Ying Wang
b14bc39b36 am 9f693b8f: Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks" 
* commit '9f693b8f1e97fd8977d66e3bf003d7b9460be0e7':
  Use LOCAL_POST_LINK_CMD to install toolbox symlinks
 2014-11-25 19:03:21 +00:00
Elliott Hughes
59acfee63f am f3c8eb83: Merge "Remove dead tools." 
* commit 'f3c8eb838db02a5fc215e178e4eb319831894d48':
  Remove dead tools.
 2014-11-25 19:03:20 +00:00
Elliott Hughes
a0959e90f5 am 8eb770d3: Merge "Remove long-dead readtty." 
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
  Remove long-dead readtty.
 2014-11-25 19:03:12 +00:00
Elliott Hughes
0c0ab6bb06 resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aosp 
Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b
 2014-11-25 11:00:41 -08:00
Elliott Hughes
7376cef149 Lose mkswap, swapoff, and swapon to toybox. 
Change-Id: Iedb371ad0f1f74822b3ff4bc1b7b1f9e6ecd300d
 2014-11-24 16:13:03 -08:00
Elliott Hughes
64d2944674 Lose printenv to toybox. 
Change-Id: Icdc6766a7ef853bc846fe811fa2ad2284ed8a18f
 2014-11-24 15:32:51 -08:00
Elliott Hughes
493faf525c Lose sleep to toybox. 
No pun intended.

Change-Id: Ic1d9c8fa9719a7749b4eeaeac20df313600c0b88
 2014-11-24 15:22:22 -08:00
Elliott Hughes
47b3f9e29d Lose sync to toybox. 
Change-Id: I36c98135bb4ab1e2ca7137b7a83782fce5ac683a
 2014-11-24 14:53:09 -08:00
Ying Wang
9f693b8f1e Merge "Use LOCAL_POST_LINK_CMD to install toolbox symlinks" 2014-11-24 22:17:57 +00:00
Ying Wang
7d45be0e4a Use LOCAL_POST_LINK_CMD to install toolbox symlinks 
It's simpler; Also whenever toolbox is updated the symlinks get
recreated.

Change-Id: I03fb61a5e0f14fd4ed23680dd6db87eed5b46787
 2014-11-24 14:09:24 -08:00
Elliott Hughes
3024977037 Remove dead tools. 
These have all been obsolete since we first moved to git!

Change-Id: Ie5bfc1b30000930ef6a604b4313ff7af1b7c4573
 2014-11-24 14:03:28 -08:00
Elliott Hughes
8eb770d37c Merge "Remove long-dead readtty." 2014-11-24 21:43:32 +00:00
Elliott Hughes
b120134bd1 Remove long-dead readtty. 
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
 2014-11-24 12:01:21 -08:00
Elliott Hughes
b054178a15 Lose insmod/lsmod/rmmod to toybox. 
Change-Id: Ia654cdca14a4fda958a406f5e6ccd0919ce88a8f
 2014-11-24 11:34:14 -08:00
Elliott Hughes
3d5b5162e3 am 7f187c5f: Merge "Lose clear, false, and true to toybox." 
* commit '7f187c5f95d6bf0514e71e0e074768bd5395d45f':
  Lose clear, false, and true to toybox.
 2014-11-23 18:10:39 +00:00
Elliott Hughes
ed7959fe62 Lose clear, false, and true to toybox. 
Change-Id: I125ea881e61b834b188d9a5411f3b6efe59b9bad
 2014-11-22 22:58:42 -08:00
Elliott Hughes
b0669f5aa2 am caed3d9f: Merge "notify: dynamically allocate filename buffer" 
* commit 'caed3d9fae1fd372dfa01cb60fbf157233c9052e':
  notify: dynamically allocate filename buffer
 2014-11-21 20:25:58 +00:00
Johan Redestig
80bf9a456e notify: dynamically allocate filename buffer 
use asprintf to dynamically allocate filename buffer
rather than just reserving 512 bytes on the stack to
avoid potential overflow.

Change-Id: Ieeb9c6c2e5f97a9574f8128d84eba0b8efdb7263
 2014-11-20 15:25:18 +01:00
Elliott Hughes
450c4ad097 am 16068830: Merge "toolbox: enable mkswap to work on block devices" 
* commit '16068830444361ab65cbc9804b76e2d415aff9a2':
  toolbox: enable mkswap to work on block devices
 2014-11-18 19:19:49 +00:00
Andrew Boie
d90615cefd toolbox: enable mkswap to work on block devices 
Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2014-11-18 10:42:14 -08:00
Elliott Hughes
23ac318d56 am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed" 
* commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca':
  toolbox: indicate why swap{on|off} failed
 2014-11-18 18:06:06 +00:00
Elliott Hughes
91cb2cb341 Merge "toolbox: indicate why swap{on|off} failed" 2014-11-18 17:57:59 +00:00
Dmitriy Ivanov
e4d7eaab97 am 359d58dc: resolved conflicts for merge of cb8c583d to stage-aosp-master 
* commit '359d58dc0f54d1ca0ee8789b4b7611bbb50bbda5':
  Fix ps <process name>
 2014-11-03 17:38:04 +00:00
Dmitriy Ivanov
359d58dc0f resolved conflicts for merge of cb8c583d to stage-aosp-master 
Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
 2014-11-03 09:27:47 -08:00
Dmitriy Ivanov
65267bcc27 Fix ps <process name> 
Use /proc/pid/cmdline instead of /proc/pid/stat
 to filter process by name.

Bug: 8638853
Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
 2014-11-03 01:28:31 -08:00
Iliyan Malchev
343e66d6e0 toolbox: add prlimit command 
automerge: 5b244cd

* commit '5b244cd4141d7e42bf9382e39c669e1ccf96266c':
  toolbox: add prlimit command
 2014-10-28 00:25:18 +00:00
Iliyan Malchev
5b244cd414 toolbox: add prlimit command 
adb shell prlimit <pid> <cur> <max>

prlimit uses prlimit internally to allow you to set the limits on an arbitrary
process, if you have the privileges to.

Change-Id: Ie9a5dc510c7c695debd8f948361d4c51befa5604
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2014-10-27 12:25:41 -07:00
Daniel Rosenberg
9011c1bc7a am 86b4dba9: am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once 
* commit '86b4dba9c48841659c566ac71a034230f02ec259':
  newfs_msdos: Set sectors per fat once
 2014-10-11 04:55:01 +00:00
Daniel Rosenberg
86b4dba9c4 am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat once 
* commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179':
  newfs_msdos: Set sectors per fat once
 2014-10-11 02:49:40 +00:00
Daniel Rosenberg
8bdcc99d60 am 8218b6aa: newfs_msdos: Set sectors per fat once 
* commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447':
  newfs_msdos: Set sectors per fat once
 2014-10-10 23:38:45 +00:00
Daniel Rosenberg
8218b6aae9 newfs_msdos: Set sectors per fat once 
There was an issue causing the fat size to shrink too small, causing
a fsck check to fail.

Bug: 17949028
Bug: 17761281
Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-10-10 14:40:48 -07:00
Elliott Hughes
28a78a25cf am f7c287b7: am 47d24416: Merge "Fix top for very large VSS." 
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
  Fix top for very large VSS.
 2014-10-08 18:30:26 +00:00
Elliott Hughes
5c9d4227fe am f7c287b7: am 47d24416: Merge "Fix top for very large VSS." 
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
  Fix top for very large VSS.
 2014-10-08 18:29:57 +00:00
Elliott Hughes
2c05b4fe41 Fix top for very large VSS. 
Bug: 17913995

(cherry picked from commit 052d78f334)

Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
 2014-10-08 11:21:23 -07:00
Elliott Hughes
052d78f334 Fix top for very large VSS. 
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
 2014-10-08 11:20:03 -07:00
Elliott Hughes
ddf510d478 am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message." 
* commit '85cac2abd416120646b0fe058aac812ca517d71b':
  Fix a typo in ioctl usage message.
 2014-10-06 17:20:55 +00:00