]> www.infradead.org Git - users/hch/uuid.git/commitdiff
projects / users / hch / uuid.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0db7443 6fd60fa)
Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:43:09 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:43:09 +0000 (15:43 -0700)
Old tree, so the automatic merge had some problems.

1  2 
drivers/i2c/busses/Kconfig patch | diff1 | diff2 | blob | history

diff --cc drivers/i2c/busses/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.