]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3925e6f 3ee08ae)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 20 Apr 2008 00:38:13 +0000 (20:38 -0400)
1  2 
drivers/misc/Kconfig patch | diff1 | diff2 | blob | history
drivers/misc/Makefile patch | diff1 | diff2 | blob | history

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