Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/
authorTony Lindgren <tony@atomide.com>
Thu, 25 Jan 2007 22:21:41 +0000 (14:21 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Jan 2007 22:21:41 +0000 (14:21 -0800)
commitf6a5d6a63591af9e0ee908644c137e2b72a87c9b
tree725169c8c06b51da96c9fd375b743a03c5b6431e
parentf69169f90c434088afd97a7099b47837d8e39865
parent99abfeafb5f2eea1bb481330ff37343e1133c924
Merge branch 'master' of /home/tmlind/src/kernel/linux-2.6/

Conflicts:

drivers/mmc/omap.c
drivers/mtd/nand/Makefile
Makefile
drivers/mtd/maps/omap_nor.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile