]> www.infradead.org Git - users/hch/uuid.git/commitdiff
projects / users / hch / uuid.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4684fe0 d4348c6)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 26 Aug 2010 20:11:25 +0000 (15:11 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Thu, 26 Aug 2010 20:11:25 +0000 (15:11 -0500)
1  2 
drivers/staging/Kconfig patch | diff1 | diff2 | blob | history
drivers/staging/Makefile patch | diff1 | diff2 | blob | history

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