]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99988f7 d470a97)
Merge branch 'master' of git://git.infradead.org/~gleixner/mtd-nand-2.6.git
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 24 May 2006 09:01:43 +0000 (10:01 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 24 May 2006 09:01:43 +0000 (10:01 +0100)
1  2 
fs/jffs2/wbuf.c patch | diff1 | diff2 | blob | history

diff --cc fs/jffs2/wbuf.c
Simple merge
Linux 2.6 source tree