Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Dec 2007 01:15:04 +0000 (17:15 -0800)
commit1f761307b87f21217bdd1165d5a38cbc9b3aa914
tree344c7d401a68be0e747fab3a47e4725cf92f74de
parentd17ab340b754c88038c28152c933562531e4b594
parent2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/compressed/head.S
drivers/watchdog/Kconfig