aboutsummaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-16 07:45:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-16 07:45:05 -0700
commit1076bb40585dc3a4ae6143ecc5a1654495b84c42 (patch)
tree02b417d08f08d7491aca699aaf75ed79c0f5121d /net/unix
parentb4b8f57965e007afbbb0175ea28f733723c5260b (diff)
parent07c3b1a1001614442c665570942a3107a722c314 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: remove broken usb-serial num_endpoints check USB: option: Add new vendor ID and device ID for AMOI HSDPA modem USB: support more Huawei data card product IDs USB: option.c: add more device IDs USB: Obscure Maxon BP3-USB Device Support 16d8:6280 for option driver
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions