summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-25 00:14:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-25 00:14:43 +0200
commitb5aef682e00c424bb2f55639168083b61803a012 (patch)
treeb7b69146e8331f96db02b766fc139d8a0907d446 /drivers/misc
parentfirmware loader: fix compile warning with PM_SLEEP set (diff)
parentLinux 3.10-rc7 (diff)
downloadlinux-b5aef682e00c424bb2f55639168083b61803a012.tar.xz
linux-b5aef682e00c424bb2f55639168083b61803a012.zip
Merge 3.10-rc7 into driver-core-next
We want the firmware merge fixes, and other bits, in here now. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
0 files changed, 0 insertions, 0 deletions