Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index e5eb65cfb3eb..a0dd7bba9481 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -172,7 +172,7 @@ config MTD_OCTAGON
           This provides a 'mapping' driver which supports the way in which
           the flash chips are connected in the Octagon-5066 Single Board
           Computer. More information on the board is available at
-          <http://www.octagonsystems.com/CPUpages/5066.html>.
+          <http://www.octagonsystems.com/products/5066.aspx>.
 
 config MTD_VMAX
         tristate "JEDEC Flash device mapped on Tempustech VMAX SBC301"
@@ -293,7 +293,7 @@ config MTD_TQM8XXL
           chips, currently uses AMD one. This 'mapping' driver supports
           that arrangement, allowing the CFI probe and command set driver
           code to communicate with the chips on the TQM8xxL board. More at
-          <http://www.denx.de/embedded-ppc-en.html>.
+          <http://www.denx.de/wiki/PPCEmbedded/>.
 
 config MTD_RPXLITE
         tristate "CFI Flash device mapped on RPX Lite or CLLF"