summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-09-22 23:14:40 -0700
committerJosh Triplett <josh@joshtriplett.org>2014-09-22 23:14:40 -0700
commit3cf6b0151ba584714f6eafb99bc66d7326efeed7 (patch)
tree5d0d9de064208086a10c6ff864cd947cf6713679 /scripts
parentb25c2ff547530f63d71fc67048543ae54b434476 (diff)
parent9def39be4e960917fcb80514ff23651f9ec97193 (diff)
parentd3ac21cacc24790eb45d735769f35753f5b56ceb (diff)
parent0da1d4a0b9516adb2acc4841e9f6da6618f47f4e (diff)
parent3afed06a355b5525d9a87bcb76567ef2e2e7b3a2 (diff)
downloadlinux-3cf6b0151ba584714f6eafb99bc66d7326efeed7.tar.bz2
Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next