]> err.no Git - linux-2.6/commit
Merge commit 'origin/master'
authorTollef Fog Heen <tfheen@err.no>
Sat, 30 Aug 2008 20:38:57 +0000 (22:38 +0200)
committerTollef Fog Heen <tfheen@err.no>
Sat, 30 Aug 2008 20:38:57 +0000 (22:38 +0200)
commitf5c9ddc8f932067fc38c85445d950425886e6698
treecd1ea0d157a4c428c87fb19f34d3f759a9658149
parent1200afc60bb2e0ae9939e0ecb1637e7967e79735
parentbef69ea0dcce574a425feb0a5aa4c63dd108b9a6
Merge commit 'origin/master'

Conflicts:

drivers/usb/serial/ch341.c
drivers/usb/serial/ch341.c