]> git.hungrycats.org Git - linux/commitdiff
Merge http://gkernel.bkbits.net/irda-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:26:43 +0000 (20:26 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:26:43 +0000 (20:26 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge