summaryrefslogtreecommitdiffstats
path: root/include/acpi/actbl2.h
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2013-05-10 07:54:01 -0700
committerJames Bottomley <JBottomley@Parallels.com>2013-05-10 07:54:01 -0700
commit297b8a07347555f0d2fafa4a1ddfc332d2d4afa9 (patch)
tree7c54ce22c1cd10118b5094441b8d7da2f4c58d6a /include/acpi/actbl2.h
parent832e77bc1106592c621fc42f2f6a4500e414a0a1 (diff)
parent6df339a51e3bf18b868384bdeb31e49a4fbaa3d8 (diff)
downloadlinux-297b8a07347555f0d2fafa4a1ddfc332d2d4afa9.tar.bz2
Merge branch 'postmerge' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/acpi/actbl2.h')
0 files changed, 0 insertions, 0 deletions