]> pilppa.com 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: 68d09b1 b377fd3)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Thu, 23 Aug 2007 09:43:14 +0000 (10:43 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Thu, 23 Aug 2007 09:43:14 +0000 (10:43 +0100)
1  2 
drivers/mtd/Makefile patch | diff1 | diff2 | blob | history
drivers/mtd/mtdchar.c patch | diff1 | diff2 | blob | history

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