diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-07 13:51:31 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-07 13:51:31 -0700 |
| commit | 274994c49c0ae7c42ce96dcd33b9555a697e7391 (patch) | |
| tree | 704222fc145815930c6bec732025ff3584d8e48f /net/ceph/osd_client.c | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | daa37cee791722711bf15b9635d007014e73ad3d (diff) | |
Merge branch 'for_3.5/cleanup/omap-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into cleanup-cpuidleomap-cleanup-cpuidle-for-v3.5
Diffstat (limited to 'net/ceph/osd_client.c')
0 files changed, 0 insertions, 0 deletions