diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
| commit | 0e9882b4fb8703f13921279fe4a6592574f92c62 (patch) | |
| tree | 001ea9826ec3011e19986eb81cc7597d58f4f999 /Documentation/sound | |
| parent | c4bb07ec0084e26323047bcbe446d59ac352e07f (diff) | |
| parent | 24d6a9d07f7da6c635530688a43086ea293bf9dc (diff) | |
Merge commit 'v2.6.38.1' into linaro-2.6.38
Conflicts:
drivers/usb/core/hcd-pci.c
drivers/usb/host/isp1760-hcd.c
include/linux/usb/ch9.h
Diffstat (limited to 'Documentation/sound')
0 files changed, 0 insertions, 0 deletions