diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 00:06:51 -0400 |
| commit | 8b53b57576292b92b27769f9e213df19b6e57786 (patch) | |
| tree | cd851ce4fa71b2653f120d7f11a9c6cbcf311b19 /Documentation/devices.txt | |
| parent | ab7e79243746e2a9c5f00243e60108189c44c9eb (diff) | |
| parent | 38cc1c3df77c1bb739a4766788eb9fa49f16ffdf (diff) | |
Merge branch 'x86/urgent' into x86/pat
Conflicts:
arch/x86/mm/pageattr.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/devices.txt')
| -rw-r--r-- | Documentation/devices.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index e6244cde26e9..05c80645e4ee 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
| @@ -2560,9 +2560,6 @@ Your cooperation is appreciated. | |||
| 2560 | 96 = /dev/usb/hiddev0 1st USB HID device | 2560 | 96 = /dev/usb/hiddev0 1st USB HID device |
| 2561 | ... | 2561 | ... |
| 2562 | 111 = /dev/usb/hiddev15 16th USB HID device | 2562 | 111 = /dev/usb/hiddev15 16th USB HID device |
| 2563 | 112 = /dev/usb/auer0 1st auerswald ISDN device | ||
| 2564 | ... | ||
| 2565 | 127 = /dev/usb/auer15 16th auerswald ISDN device | ||
| 2566 | 128 = /dev/usb/brlvgr0 First Braille Voyager device | 2563 | 128 = /dev/usb/brlvgr0 First Braille Voyager device |
| 2567 | ... | 2564 | ... |
| 2568 | 131 = /dev/usb/brlvgr3 Fourth Braille Voyager device | 2565 | 131 = /dev/usb/brlvgr3 Fourth Braille Voyager device |