]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2764fb4 60b341b)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 26 Feb 2010 19:04:15 +0000 (19:04 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 26 Feb 2010 19:06:24 +0000 (19:06 +0000)
The SmartMedia FTL code depends on new kfifo bits from 2.6.33

1  2 
drivers/mtd/nand/Kconfig patch | diff1 | diff2 | blob | history
drivers/mtd/nand/Makefile patch | diff1 | diff2 | blob | history
lib/idr.c patch | diff1 | diff2 | blob | history

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