summaryrefslogtreecommitdiffstats
path: root/fs/devpts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-07-19 09:34:42 +0200
committerIngo Molnar <mingo@kernel.org>2013-07-19 09:34:42 +0200
commite43fff2b98b4e99b189c086a9cf740b19eaf3538 (patch)
tree658a5f73d5806fe47856547b17cbd23592856c62 /fs/devpts
parent67516844625f45f0ce148a01c27bf41f591872b2 (diff)
parentecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b (diff)
downloadlinux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.tar.gz
linux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.tar.bz2
linux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.zip
Merge branch 'linus' into perf/core
Merge in a v3.11-rc1-ish branch to go from v3.10 based development to a v3.11 based one. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/devpts')
0 files changed, 0 insertions, 0 deletions