diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2013-06-24 15:14:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2013-06-24 15:14:43 -0700 |
| commit | b5aef682e00c424bb2f55639168083b61803a012 (patch) | |
| tree | b7b69146e8331f96db02b766fc139d8a0907d446 /drivers/ptp | |
| parent | firmware loader: fix compile warning with PM_SLEEP set (diff) | |
| parent | Linux 3.10-rc7 (diff) | |
| download | linux-b5aef682e00c424bb2f55639168083b61803a012.tar.gz linux-b5aef682e00c424bb2f55639168083b61803a012.tar.bz2 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/ptp')
0 files changed, 0 insertions, 0 deletions