diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:14:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-19 20:14:23 -0700 |
commit | a9cf7cd0d7474026d05296c666a0b7f83d798c03 (patch) | |
tree | afaf5041d3efabb5f5b0032d5b0e67ffacd84c28 /include/asm-ia64/kprobes.h | |
parent | 62b6e9ff08ced882b36c9583e350699f28912e51 (diff) | |
parent | 69806d5631b79ed0c442ae5b15c46bcfd8662476 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: new Novatel device ids for option driver
USB: berry_charge: correct dbg string for second magic command
usblp: quirk flag and device entry for Seiko Epson M129C printer
airprime: USB ID for Novatel EV620 mini PCI-E card
USB: necessary update for mos7720 driver
USB: RAZR v3i unusual_devs
USB: two more device ids for dm9601 usbnet driver
USB: fix usb-serial regression
Diffstat (limited to 'include/asm-ia64/kprobes.h')
0 files changed, 0 insertions, 0 deletions