]> git.hungrycats.org Git - linux/commitdiff
Merge samba.org:/scratch/anton/linux-2.5
authorAnton Blanchard <anton@samba.org>
Fri, 31 May 2002 22:36:19 +0000 (08:36 +1000)
committerAnton Blanchard <anton@samba.org>
Fri, 31 May 2002 22:36:19 +0000 (08:36 +1000)
into samba.org:/scratch/anton/linux-2.5_hvc_console

1  2 
drivers/char/Makefile

Simple merge