summaryrefslogtreecommitdiff
path: root/include/linux/dmi.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 03:51:27 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 03:51:27 +0400
commit8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e (patch)
tree88cd7852d59ebae54fcc2f57019ea13284042962 /include/linux/dmi.h
parent6f586e663e3b3674cadad0d5329424b006a0a289 (diff)
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff)
downloadlinux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.xz
Merge 3.6-rc7 into driver-core-next
This pulls in the fixes in that branch that are needed here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/dmi.h')
0 files changed, 0 insertions, 0 deletions