]>
www.pilppa.org Git - linux-2.6-omap-h63xx.git/log 
Ralf Baechle  [Tue, 1 Mar 2005 18:12:06 +0000  (18:12 +0000)] 
New hazard handling function back_to_back_c0_hazard() to handle back toSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Tue, 1 Mar 2005 10:38:58 +0000  (10:38 +0000)] 
ISOify.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Pete Popov  [Tue, 1 Mar 2005 07:54:50 +0000  (07:54 +0000)] 
Moved irq_tab_alchemy to the board specific irqmap.c files.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Pete Popov  [Tue, 1 Mar 2005 06:33:16 +0000  (06:33 +0000)] 
Base Au1200 2.6 support.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Steven J. Hill  [Tue, 1 Mar 2005 03:51:33 +0000  (03:51  +0000)] 
Fix 'prctl' system call for IRIX. At this point IRIX 5.3 static binariesSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 28 Feb 2005 17:55:57 +0000  (17:55 +0000)] 
Gross macro abuse.  Get rid of gpreg_t, vaddr_t, REG_TO_VA and
VA_TO_REG.  Who ever wrote this apparently did enjoy the C Puzzle Book.
ISBN 
0201604612 , a little old but still fun reading for the next
blackout ;)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 28 Feb 2005 17:29:15 +0000  (17:29 +0000)] 
Cleanup fpuemuprivate declarations.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 28 Feb 2005 13:39:57 +0000  (13:39 +0000)] 
Convert struct hw_interrupt_type initializations to ISO C99 namedSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Pete Popov  [Mon, 28 Feb 2005 05:15:40 +0000  (05:15  +0000)] 
No barrier needed on au1x.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Pete Popov  [Sun, 27 Feb 2005 22:15:24 +0000  (22:15 +0000)] 
Comment correction after further investigation of issue.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Fri, 25 Feb 2005 13:11:18 +0000  (13:11 +0000)] 
Fix initialization. Unbreak the wait-for-completion loops. Code cleanup.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Tue, 22 Feb 2005 21:51:30 +0000  (21:51 +0000)] 
Switch SiByte drivers back to __raw_*() functions.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Tue, 22 Feb 2005 21:49:17 +0000  (21:49 +0000)] 
Define mem_*() I/O accessory functions that preserve byte addresses.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Tue, 22 Feb 2005 21:18:01 +0000  (21:18 +0000)] 
Merge do_boot_cpu() into the new style __cpu_up().Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 21 Feb 2005 21:34:24 +0000  (21:34 +0000)] 
On multiprocessor systems the BogoMIPS for each CPU was reported wasSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 21 Feb 2005 19:50:31 +0000  (19:50 +0000)] 
Define MAP_BASE for IP27Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 21 Feb 2005 16:18:36 +0000  (16:18 +0000)] 
Resurrect Cobalt support for 2.6.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Mon, 21 Feb 2005 11:44:31 +0000  (11:44 +0000)] 
Enable/disable irq's only if needed.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Mon, 21 Feb 2005 11:22:15 +0000  (11:22 +0000)] 
-nostdlib boilerplate.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Mon, 21 Feb 2005 11:11:32 +0000  (11:11 +0000)] 
Fix compilation, and bring 32/64 bit variants more in line.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Mon, 21 Feb 2005 10:55:16 +0000  (10:55 +0000)] 
Fix wchan implementation, based on earlier by from Atsushi Nemoto.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Mon, 21 Feb 2005 10:45:09 +0000  (10:45 +0000)] 
Improved modules loader, more robust and works on 64bit kernels.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Steven J. Hill  [Sat, 19 Feb 2005 16:15:54 +0000  (16:15 +0000)] 
Until I figure out why NFS filesystems are having problems withSigned-off-by: Steven J. Hill <sjhill@realitydiluted.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Sat, 19 Feb 2005 13:58:37 +0000  (13:58 +0000)] 
Initialize iomem_resource.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Sat, 19 Feb 2005 13:56:04 +0000  (13:56 +0000)] 
Handle addresses beyond VMALLOC_END correctly.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Sat, 19 Feb 2005 13:32:02 +0000  (13:32 +0000)] 
Use intermediate variable.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Sat, 19 Feb 2005 13:27:41 +0000  (13:27 +0000)] 
O2 doesn't have _that_ much RAM.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Pete Popov  [Fri, 18 Feb 2005 06:27:25 +0000  (06:27 +0000)] 
Changed all Au1x boards to noncoherent again.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 21:25:03 +0000  (21:25 +0000)] 
32-bit compatibility for various timer-related system calls.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 21:24:16 +0000  (21:24 +0000)] 
Update to match the native siginfo structure and code.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 21:22:40 +0000  (21:22 +0000)] 
32-bit compatibility for ptrace GETEVENTMSG operation.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 21:21:29 +0000  (21:21 +0000)] 
Implement 32-bit compatibility for waitid(2).Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 21:19:59 +0000  (21:19 +0000)] 
Waitid(2) now has 5 arguments.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 21:18:52 +0000  (21:18 +0000)] 
Use generic compat_sys_wait4 to implement 32-bit wait4(2).Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 16 Feb 2005 20:15:40 +0000  (20:15 +0000)] 
Allocate break code 513 to KDB.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Sun, 13 Feb 2005 23:10:08 +0000  (23:10 +0000)] 
Replace the complicated and broken attempt to clean interrupt bySigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Sun, 13 Feb 2005 21:31:24 +0000  (21:31 +0000)] 
If you want RM7000 better fix it to build first ...Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Sun, 13 Feb 2005 18:53:26 +0000  (18:53 +0000)] 
It's unwise to disable all interrupts of the boot node ;-)Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Sun, 13 Feb 2005 00:32:43 +0000  (00:32  +0000)] 
Rewrite to avoid the use of $at.  Unfortunately binutils 2.15 and CVSSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Sat, 12 Feb 2005 04:31:49 +0000  (04:31  +0000)] 
Enable RM7000 secondary cache for Atlas and Malta boards.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Thu, 10 Feb 2005 13:54:37 +0000  (13:54 +0000)] 
Moves a test which determines if we actually need to perform aSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Thu, 10 Feb 2005 12:19:59 +0000  (12:19 +0000)] 
Update MIPS to use the 4-level pagetable code thereby getting rid ofSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Thu, 10 Feb 2005 12:00:06 +0000  (12:00 +0000)] 
Document why calling smp_call_function will deadlock when called withSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 9 Feb 2005 12:59:39 +0000  (12:59 +0000)] 
Fix ptrace aliasing issue in copy_from_user_page / copy_to_user_page.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 21:53:39 +0000  (21:53 +0000)] 
25Kf is also physically indexed.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 21:52:35 +0000  (21:52 +0000)] 
Add a few more PrId vendor IDs.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 21:41:32 +0000  (21:41 +0000)] 
20Kc and SB1 don't suffer from aliases.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 16:13:07 +0000  (16:13 +0000)] 
Delete duplicate copy of fixrange_init.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 12:14:00 +0000  (12:14 +0000)] 
rm9000_init() really is __init code.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 02:54:29 +0000  (02:54  +0000)] 
Use preempt_schedule_irq.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 02:54:29 +0000  (02:54  +0000)] 
More oprofile bits for MIPS32-style performance counters.  The code toSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Mon, 7 Feb 2005 01:27:14 +0000  (01:27  +0000)] 
It works better when including arch/mips/sgi-ip27/Kconfig ...Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Sun, 6 Feb 2005 21:55:49 +0000  (21:55 +0000)] 
Move missplaced code line to the right place.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Sun, 6 Feb 2005 21:24:55 +0000  (21:24 +0000)] 
Provide functions to access cop0 config4-7 registersSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Fri, 4 Feb 2005 15:51:26 +0000  (15:51 +0000)] 
Use hardware mechanism to deal with cache aliases in the 24K.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Fri, 4 Feb 2005 15:19:01 +0000  (15:19 +0000)] 
Remove old wrong bits of cache code.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Fri, 4 Feb 2005 01:34:52 +0000  (01:34  +0000)] 
Clean up SEAD interrupt initialization.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Thu, 3 Feb 2005 23:06:29 +0000  (23:06 +0000)] 
Mask and ack CPU interrupts upon initialization.  Keep the stateSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Thu, 3 Feb 2005 14:28:23 +0000  (14:28 +0000)] 
Move Sibyte Kconfig stuff into it's own Kconfig.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Thu, 3 Feb 2005 13:37:41 +0000  (13:37 +0000)] 
Replace deprecated interruptible_sleep_on() function call with directSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Thu, 3 Feb 2005 13:34:45 +0000  (13:34 +0000)] 
Define __raw_read_can_lock / __raw_write_can_lock.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Wed, 2 Feb 2005 22:23:46 +0000  (22:23 +0000)] 
Update descriptions for MIPS Technologies evaluation boards.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Wed, 2 Feb 2005 20:36:21 +0000  (20:36 +0000)] 
Reenable EARLY_PRINTK for the DECstation.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Tue, 1 Feb 2005 23:02:12 +0000  (23:02 +0000)] 
Formatting fixes.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Tue, 1 Feb 2005 20:21:48 +0000  (20:21 +0000)] 
Fix compilation; by Manish Lachwani.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Tue, 1 Feb 2005 20:18:59 +0000  (20:18 +0000)] 
Fixes for system controllers for Atlas/Malta core cards.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Maciej W. Rozycki  [Tue, 1 Feb 2005 12:02:37 +0000  (12:02 +0000)] 
Actually route cPCI interrupts.  Update inaccurate comments.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 26 Jan 2005 02:22:22 +0000  (02:22  +0000)] 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Wed, 26 Jan 2005 02:21:06 +0000  (02:21  +0000)] 
Fix register layout in o32 core dumps on 64-bit systems.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Tue, 21 Jun 2005 13:56:30 +0000  (13:56 +0000)] 
Get rid of early_init.  There's more need to make this form ofSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Tue, 28 Dec 2004 09:09:19 +0000  (09:09 +0000)] 
Dummy ISA DMA functions for systems that don't have ISA but shareSigned-off-by: Ralf Baechle <ralf@linux-mips.org> 
Ralf Baechle  [Tue, 28 Dec 2004 07:49:43 +0000  (07:49 +0000)] 
Fix build with SMP disabled and preemption enabled.Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Thu, 23 Dec 2004 08:21:39 +0000  (08:21 +0000)] 
Move the invalid pmd and pte tables from .data to .bss. Fix alignment.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Fri, 10 Dec 2004 12:56:33 +0000  (12:56 +0000)] 
Remove unused arguments from preempt_{start,stop}/local_irq_{en,dis}able.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Wed, 8 Dec 2004 10:32:45 +0000  (10:32 +0000)] 
Fix typos and formatting.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Thiemo Seufer  [Sat, 4 Dec 2004 21:35:05 +0000  (21:35 +0000)] 
De-optimize and decomplicate the spurious interrupt handler.Signed-off-by: Thiemo Seufer <ths@networkno.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> 
Al Viro  [Sat, 29 Oct 2005 11:07:11 +0000  (12:07 +0100)] 
[PATCH] type fix in arm/boot/compressed/misc.cSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 11:02:00 +0000  (12:02 +0100)] 
[PATCH] bluetooth hidp is broken on s390Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 10:56:13 +0000  (11:56 +0100)] 
[PATCH] idmouse cleanup and overflow fix
switched to simple_read_from_buffer(), killed broken use of min().
Incidentally, that use of min() had been fixed once, only to be
reintroduced in commit 
4244f72436ab77c3c29a6447af81734ab3925d85 :
    [PATCH] USB: upgrade of the idmouse driver
[snip]
-       if (count > IMGSIZE - *ppos)
-               count = IMGSIZE - *ppos;
+       count = min ((loff_t)count, IMGSIZE - (*ppos));
Note the lovely use of cast to shut the warning about misuse of min()
up...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> 
Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 10:49:33 +0000  (11:49 +0100)] 
[PATCH] amikbd fixSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 06:32:07 +0000  (07:32 +0100)] 
[PATCH] missing exports of do_settimeofday() variantsSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 06:08:49 +0000  (07:08 +0100)] 
[PATCH] missing bits in sparkspkr conversionSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 06:06:59 +0000  (07:06 +0100)] 
[PATCH] arguments out of order in class_device_create() call (s390)Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 05:46:03 +0000  (06:46 +0100)] 
[PATCH] missing include in infinibandSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Roland Dreier <rolandd@cisco.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 05:38:44 +0000  (06:38 +0100)] 
[PATCH] sata_sil24 iomem annotations and fixesSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Al Viro  [Sat, 29 Oct 2005 05:36:27 +0000  (06:36 +0100)] 
[PATCH] s2io iomem annotationsSigned-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Oleg Nesterov  [Sat, 29 Oct 2005 15:37:40 +0000  (19:37 +0400)] 
[PATCH] fix ->signal->live leak in copy_process()Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Tejun Heo  [Sat, 29 Oct 2005 09:18:42 +0000  (18:18 +0900)] 
[PATCH] blk: fix merge bug in as-ioschedSigned-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 
Arnaldo Carvalho de Melo  [Sat, 29 Oct 2005 05:10:35 +0000  (03:10  -0200)] 
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Jayachandran C  [Thu, 27 Oct 2005 22:10:01 +0000  (15:10 -0700)] 
[IPV4]: Fix issue reported by Coverity in ipv4/fib_frontend.cSigned-off-by: Jayachandran C. <c.jayachandran at gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> 
Stephen Hemminger  [Tue, 25 Oct 2005 22:03:41 +0000  (15:03 -0700)] 
[ETH]: ether address compareSigned-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> 
Akinobu Mita  [Fri, 21 Oct 2005 09:00:48 +0000  (18:00 +0900)] 
[TCP]: fix tcp_tso_win_divisor documentationSigned-off-by: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> 
Linus Torvalds  [Sat, 29 Oct 2005 04:09:26 +0000  (21:09 -0700)] 
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds  [Sat, 29 Oct 2005 04:08:14 +0000  (21:08 -0700)] 
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Greg Kroah-Hartman  [Sat, 29 Oct 2005 02:59:31 +0000  (19:59 -0700)] 
USB: fix up some odd parts due to partial mergesSigned-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
Arnaldo Carvalho de Melo  [Sat, 29 Oct 2005 01:35:02 +0000  (23:35 -0200)] 
Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
Greg Kroah-Hartman  [Tue, 21 Jun 2005 04:15:16 +0000  (21:15 -0700)] 
[PATCH] USB: add nokia_dku2 driverSigned-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
Martin Hagelin  [Wed, 26 Oct 2005 19:10:41 +0000  (21:10 +0200)] 
[PATCH] USB: add new device id to ftdi_sio moduleSigned-off-by: Martin Hagelin <martin.hagelin@home.se> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
Koen Kooi  [Wed, 26 Oct 2005 17:42:53 +0000  (19:42 +0200)] 
[PATCH] USB: fix correct wording in drivers/usb/net/KConfigSigned-off-by: Koen Kooi <koen@handhelds.org> 
Andrew Morton  [Mon, 24 Oct 2005 06:02:20 +0000  (23:02 -0700)] 
[PATCH] USB: fix pm patches with CONFIG_PM off part 2Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>