]> git.hungrycats.org Git - linux/commitdiff
Merge kroah.com:/home/greg/linux/BK/bleed-2.5
authorGreg Kroah-Hartman <greg@kroah.com>
Tue, 30 Dec 2003 04:19:45 +0000 (20:19 -0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Tue, 30 Dec 2003 04:19:45 +0000 (20:19 -0800)
into kroah.com:/home/greg/linux/BK/i2c-new_drivers-2.6

1  2 
include/linux/i2c-id.h

Simple merge