summaryrefslogtreecommitdiff
path: root/Next
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-28 16:56:10 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-28 16:56:10 +1000
commitf4bd21583b4299129a76283a282e90e80b562243 (patch)
treec55a37283c35deeda0d211124d44dd1e0e10c2f2 /Next
parentadfc987237b3058e04cb2e3af53559d584e01e70 (diff)
parent4733fd328f14280900435d9dbae1487d110a4d56 (diff)
Merge branch 'mtmp'
Conflicts: drivers/usb/serial/usb-serial.c
Diffstat (limited to 'Next')
0 files changed, 0 insertions, 0 deletions