aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2011-03-24 15:25:53 +0000
committerLinus Torvalds <[email protected]>2011-03-24 15:25:53 +0000
commit200460067d19db4aab7f1d9f5c95dd644d260337 (patch)
tree19fc0a5ad95109bf1407e2be41caa91f69963cff /net/unix/af_unix.c
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
parentintel_idle: Rename cpuidle states (diff)
downloadkernel-200460067d19db4aab7f1d9f5c95dd644d260337.tar.gz
kernel-200460067d19db4aab7f1d9f5c95dd644d260337.zip
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: intel_idle: Rename cpuidle states
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions