diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 07:36:51 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 07:36:51 (GMT) |
commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /drivers/usb/serial/keyspan_pda.c | |
parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
download | linux-fsl-qoriq-6396fc3b3ff3f6b942992b653a62df11dcef9bea.tar.xz |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'drivers/usb/serial/keyspan_pda.c')
0 files changed, 0 insertions, 0 deletions