summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 15:14:43 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 15:14:43 -0700
commitb5aef682e00c424bb2f55639168083b61803a012 (patch)
treeb7b69146e8331f96db02b766fc139d8a0907d446 /drivers/misc
parent90f8908127b55aa22f5a995880d5ac8cd23fbe1e (diff)
parent9e895ace5d82df8929b16f58e9f515f6d54ab82d (diff)
downloadop-kernel-dev-b5aef682e00c424bb2f55639168083b61803a012.zip
op-kernel-dev-b5aef682e00c424bb2f55639168083b61803a012.tar.gz
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
OpenPOWER on IntegriCloud