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
drivers/mtd/nand/Makefile
lib/idr.c

Simple merge
Simple merge
diff --cc lib/idr.c
Simple merge