summaryrefslogtreecommitdiffstats
path: root/toolbox/insmod.c
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-10 11:30:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-10 11:30:36 -0700
commit0dd00036d2a292d96376fbbd22bdc89580f4559c (patch)
tree042998465051b06415f108efa8d576d9c0e88e45 /toolbox/insmod.c
parenta5220b24d1b17b142e373aacbadf79a00effbbf0 (diff)
parent1d10577e9b474a5099d0f5a09468c55a0324d876 (diff)
downloadsystem_core-0dd00036d2a292d96376fbbd22bdc89580f4559c.zip
system_core-0dd00036d2a292d96376fbbd22bdc89580f4559c.tar.gz
system_core-0dd00036d2a292d96376fbbd22bdc89580f4559c.tar.bz2
am 1d10577e: manual merge from readonly-korg-master
Merge commit '1d10577e9b474a5099d0f5a09468c55a0324d876' * commit '1d10577e9b474a5099d0f5a09468c55a0324d876': Don't alias 'stop' to 'kill -STOP'
Diffstat (limited to 'toolbox/insmod.c')
0 files changed, 0 insertions, 0 deletions