]> git.hungrycats.org Git - linux/commitdiff
Merge bk://stop.crashing.org/linux-2.6-misc
authorPaul Mackerras <paulus@samba.org>
Fri, 22 Aug 2003 19:54:45 +0000 (05:54 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 22 Aug 2003 19:54:45 +0000 (05:54 +1000)
into samba.org:/stuff/paulus/kernel/for-linus-ppc

1  2 
arch/ppc/8260_io/uart.c

Simple merge