]> git.hungrycats.org Git - linux/commitdiff
Merge davem@nuts.ninka.net:/disk1/davem/BK/irda-2.6
authorDavid S. Miller <davem@kernel.bkbits.net>
Sat, 24 Jan 2004 05:47:53 +0000 (21:47 -0800)
committerDavid S. Miller <davem@kernel.bkbits.net>
Sat, 24 Jan 2004 05:47:53 +0000 (21:47 -0800)
into kernel.bkbits.net:/home/davem/irda-2.6


Trivial merge