Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 3 Feb 2008 07:29:41 +0000 (18:29 +1100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 3 Feb 2008 07:30:32 +0000 (18:30 +1100)
commitc1f3ee120bb61045b1c0a3ead620d1d65af47130
tree908430bf2b47fe8e96ac623ae7ab6dd5698d0938
parente619a75ff6201b567a539e787aa9af9bc63a3187
parent9135f1901ee6449dfe338adf6e40e9c2025b8150
Merge git://git./linux/kernel/git/torvalds/linux-2.6.git
drivers/mtd/chips/cfi_cmdset_0001.c
drivers/mtd/mtdchar.c