Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit440fdb53b4ae58602711b5b8c3a139ace2404dbb
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 1 Aug 2007 10:23:57 +0000 (1 11:23 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 1 Aug 2007 10:23:57 +0000 (1 11:23 +0100)
treec6fb88d6ad537ec53aeecadc75a61ab6147d4c9c
parent8b2b403ce0f1a816b7a6a4f47c8798003b26c07a
parent8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/mtd/devices/docprobe.c
drivers/mtd/nand/diskonchip.c