diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 16:06:26 -0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 16:06:26 -0400 |
| commit | eac0556750e727ff39144a9a9e59d5ccf1fc0e2a (patch) | |
| tree | f5ccff7795b2ad5e47f17fb475599c526f533e79 /include/net/bluetooth/sco.h | |
| parent | f71fa31f9f7ac33cba12b8897983f950ad2c7a5b (diff) | |
| parent | 19853301ef3289bda2d5264c1093e74efddaeab9 (diff) | |
Merge branch 'linus' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'include/net/bluetooth/sco.h')
0 files changed, 0 insertions, 0 deletions