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)
commita7790532f5b7358c33a6b1834dc2b318de209f31
tree0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce
parent2764fb4244cc1bc08df3667924ca4a972e90ac70
parent60b341b778cc2929df16c0a504c91621b3c6a4ad
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

The SmartMedia FTL code depends on new kfifo bits from 2.6.33
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
lib/idr.c