diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-16 19:49:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-16 19:49:03 -0700 |
| commit | 542a67246794a0f346e95129c2a2221480462eba (patch) | |
| tree | 001ddc86937e390fde7f6c288c7c212794798818 /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly (diff) | |
| download | linux-542a67246794a0f346e95129c2a2221480462eba.tar.gz linux-542a67246794a0f346e95129c2a2221480462eba.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fix from Russell King:
"A build fix for an incomplete change to the ARM cpu suspend code"
* branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions