summaryrefslogtreecommitdiffstats
path: root/net/caif/cfrfml.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-05 10:06:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-05 10:06:06 -0700
commit59068e369b6a2a0a15b93624887525d9ec0f36e5 (patch)
tree7d165bb50d379e37ca7f0b3fed5da9f7719e22e4 /net/caif/cfrfml.c
parent377485f6244af255b04d662cf19cddbbc4ae4310 (diff)
parent1cc0c998fdf2cb665d625fb565a0d6db5c81c639 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull an ACPI patch from Len Brown: "It fixes a D3 issue new in 3.4-rc1." By Lin Ming via Len Brown: * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: ACPI: Fix D3hot v D3cold confusion
Diffstat (limited to 'net/caif/cfrfml.c')
0 files changed, 0 insertions, 0 deletions